Commit Graph

1550 Commits

Author SHA1 Message Date
lwl0608 a7cdcf7bd4 Merge branch 'dev_lwl' into test 2024-07-01 17:07:50 +08:00
lwl0608 8147201960 fix 2024-07-01 17:07:38 +08:00
lwl0608 f6623d9a43 merge 2024-07-01 16:01:48 +08:00
lwl0608 e19471c4bd fix 2024-07-01 15:59:42 +08:00
lwl0608 731f0f0db7 Merge branch 'dev-lwl/withhh' into test 2024-06-28 14:33:19 +08:00
lwl0608 bbc808e27a fix 2024-06-28 14:33:01 +08:00
chenhao c887c8238b Merge pull request 'feat-IRONFANS-120-Robin' (#566) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/566
2024-06-27 22:08:13 +08:00
chenhao e1d6fb9b15 Merge pull request 'by Robin at 20240627' (#565) from feat-IRONFANS-120-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/565
2024-06-27 18:31:56 +08:00
Leufolium 3a1e5bfe9d by Robin at 20240627 2024-06-27 18:31:41 +08:00
chenhao a915de9e59 Merge pull request 'conf' (#564) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/564
2024-06-27 18:21:12 +08:00
Leufolium 2f089b0113 Merge branch 'feat-IRONFANS-139-Robin' into conf 2024-06-27 18:20:52 +08:00
Leufolium 6b730ba361 by Robin at 20240627 2024-06-27 18:19:11 +08:00
lwl0608 15fc9e3212 add create order freeze 2024-06-27 17:23:48 +08:00
chenhao dc04f64729 Merge pull request 'by Robin at 20240627' (#562) from BUG-20240627-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/562
2024-06-27 15:21:16 +08:00
chenhao 837a98c7fc Merge pull request 'by Robin at 20240627' (#561) from BUG-20240627-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/561
2024-06-27 15:21:05 +08:00
Leufolium 66270eb80d by Robin at 20240627 2024-06-27 15:20:21 +08:00
chenhao 2f1d45a898 Merge pull request '1' (#560) from feat-IRONFANS-120-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/560
2024-06-26 18:13:24 +08:00
Leufolium ef33c42e0d 1 2024-06-26 18:13:09 +08:00
chenhao 9c63784d7d Merge pull request 'conflict' (#559) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/559
2024-06-26 17:39:50 +08:00
Leufolium 7bf51c7a87 Merge branch 'feat-IRONFANS-120-Robin' into conflict 2024-06-26 17:39:27 +08:00
Leufolium 1124d413fa by Robin at 20240626 2024-06-26 17:37:00 +08:00
chenhao 160e5af3b8 Merge pull request 'feat-IRONFANS-148-Robin' (#557) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/557
2024-06-26 13:31:26 +08:00
Leufolium af835ff284 by Robin at 20240626 2024-06-26 13:30:32 +08:00
Leufolium 7e8c00e926 by Robin at 20240626 2024-06-26 13:26:46 +08:00
chenhao 910157fa9c Merge pull request 'by Robin at 20240626' (#556) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/556
2024-06-26 13:17:10 +08:00
Leufolium 49e47c99d0 by Robin at 20240626 2024-06-26 13:16:26 +08:00
chenhao 497647dd99 Merge pull request 'by Robin at 20240626' (#555) from feat-IRONFANS-148-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/555
2024-06-26 12:44:34 +08:00
Leufolium 2cfe121fd1 by Robin at 20240626 2024-06-26 12:40:09 +08:00
chenhao 01bd876048 Merge pull request 'by Robin at 20240625' (#554) from feat-IRONFANS-141-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/554
2024-06-25 21:18:26 +08:00
Leufolium eedef90097 by Robin at 20240625 2024-06-25 21:18:12 +08:00
chenhao 4ff8d8ebe9 Merge pull request 'conflict' (#553) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/553
2024-06-25 18:33:07 +08:00
Leufolium fd19b615b7 Merge branch 'feat-IRONFANS-148-Robin' into conflict 2024-06-25 18:31:54 +08:00
Leufolium 294f637de0 by Robin at 20240625 2024-06-25 18:23:18 +08:00
Leufolium a59a4ca43f by Robin at 20240625 2024-06-25 17:48:24 +08:00
chenhao 35476f66a6 Merge pull request 'feat-IRONFANS-141-Robin' (#550) from feat-IRONFANS-141-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/550
2024-06-25 17:44:48 +08:00
chenhao 5566efa436 Merge pull request 'by Robin at 20240624' (#549) from feat-IRONFANS-141-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/549
2024-06-24 21:33:29 +08:00
Leufolium 5fcfea53ab by Robin at 20240624 2024-06-24 21:30:52 +08:00
Leufolium 45d78dfd17 1 2024-06-24 21:24:08 +08:00
Leufolium 813636ca8f by Robin at 20240624 2024-06-24 19:14:31 +08:00
lwl0608 5f86fc08bb merge 2024-06-24 16:01:26 +08:00
lwl0608 e56ec4861b fix zone moment 2024-06-24 16:00:25 +08:00
chenhao aebca4b24d Merge pull request 'by Robin at 20240621' (#548) from feat-IRONFANS-141-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/548
2024-06-21 21:28:28 +08:00
Leufolium 900a803525 by Robin at 20240621 2024-06-21 21:28:16 +08:00
chenhao 0b2f32d156 Merge pull request '1' (#547) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/547
2024-06-21 20:37:19 +08:00
Leufolium ce2931c057 1 2024-06-21 20:36:59 +08:00
chenhao b9e84eb43c Merge pull request 'conf' (#546) from conf into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/546
2024-06-21 20:34:29 +08:00
Leufolium 210555f7d5 Merge branch 'feat-IRONFANS-141-Robin' into conf 2024-06-21 20:33:44 +08:00
Leufolium 177a95ac35 by Robin at 20240621 2024-06-21 20:28:40 +08:00
Leufolium 6fb44a3b01 by Robin at 20240621 2024-06-21 19:53:07 +08:00
Leufolium 41cf08be7c by Robin at 20240621 2024-06-21 19:51:55 +08:00