Commit Graph

1670 Commits

Author SHA1 Message Date
chenhao 07c2a01aaa Merge pull request 'by Robin at 20240628' (#576) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/576
2024-06-28 23:32:59 +08:00
Leufolium 02ee882bd5 by Robin at 20240628 2024-06-28 23:32:44 +08:00
chenhao b468b42b5c Merge pull request 'by Robin at 20240628' (#575) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/575
2024-06-28 23:25:49 +08:00
Leufolium 1575046a98 by Robin at 20240628 2024-06-28 23:25:22 +08:00
chenhao 19bc740f7f Merge pull request 'by Robin at 20240628' (#575) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/575
2024-06-28 23:13:58 +08:00
Leufolium 3a83ade89f by Robin at 20240628 2024-06-28 23:13:21 +08:00
lwl0608 ef7894de9a jwt 2024-06-28 22:37:42 +08:00
lwl0608 a54cd4fce4 jwt 2024-06-28 22:36:54 +08:00
chenhao 2bf04aac1b Merge pull request 'by Robin at 20240628' (#574) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/574
2024-06-28 20:39:51 +08:00
Leufolium 213cc36149 by Robin at 20240628 2024-06-28 20:39:34 +08:00
chenhao 06bc65c750 Merge pull request 'by Robin at 20240628' (#573) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/573
2024-06-28 20:28:48 +08:00
Leufolium d01ad4bdac by Robin at 20240628 2024-06-28 20:28:32 +08:00
chenhao dd98bbf779 Merge pull request 'by Robin at 20240628' (#572) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/572
2024-06-28 18:02:31 +08:00
Leufolium e919a70b1d by Robin at 20240628 2024-06-28 18:02:13 +08:00
chenhao c5ba290745 Merge pull request 'by Robin at 20240628' (#571) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/571
2024-06-28 16:10:39 +08:00
Leufolium af2c2fc366 by Robin at 20240628 2024-06-28 16:10:17 +08:00
chenhao b167ff5aaa Merge pull request 'by Robin at 20240628' (#570) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/570
2024-06-28 15:47:54 +08:00
Leufolium 2e9177c65c by Robin at 20240628 2024-06-28 15:47:40 +08:00
chenhao 817ceb47a2 Merge pull request 'by Robin at 20240628' (#569) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/569
2024-06-28 15:35:57 +08:00
Leufolium 4960594228 by Robin at 20240628 2024-06-28 15:35:12 +08:00
chenhao 5243d1e44a Merge pull request 'feat-IRONFANS-148-Robin' (#568) from feat-IRONFANS-148-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/568
2024-06-28 14:36:43 +08:00
Leufolium 361c7b33b8 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-148-Robin 2024-06-28 14:35:10 +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
Leufolium 408f786227 by Robin at 20240627 2024-06-27 18:42:33 +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
Leufolium 3a14b7a573 by Robin at 20240627 2024-06-27 14:21:46 +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