Commit Graph

622 Commits

Author SHA1 Message Date
chenhao 160c54dfba Merge pull request 'BUG-20241119' (#810) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/810
2024-11-20 16:46:27 +08:00
Leufolium 067de8dcc4 by Robin at 20241120 2024-11-20 16:45:58 +08:00
Leufolium e014d2b80a Merge branch 'feat-IRONFANS-235-Robin' into test 2024-11-18 17:00:49 +08:00
chenhao 25352fbf06 Merge pull request '1' (#805) from feat-IRONFANS-235-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/805
2024-11-18 16:57:04 +08:00
Leufolium c72afa8b57 1 2024-11-18 16:56:44 +08:00
chenhao dc82c76c4f Merge pull request 'feat-IRONFANS-235-Robin' (#804) from feat-IRONFANS-235-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/804
2024-11-18 16:44:46 +08:00
Leufolium f6a60004fe Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 16:21:46 +08:00
Leufolium 5a88ba39ae 1 2024-11-18 16:18:38 +08:00
Leufolium 761499bef5 Merge branch 'feat-IRONFANS-235-Robin' into conf-235 2024-11-18 15:18:49 +08:00
Leufolium 98cf6b3f4b by Robin at 20241118 2024-11-18 15:16:10 +08:00
Leufolium 5cb17dc87b Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-15 15:10:49 +08:00
Leufolium b7d941abe7 1 2024-11-15 15:01:07 +08:00
Leufolium 3a9b4a6827 by Robin at 20241115 2024-11-15 15:00:37 +08:00
Leufolium a74773681e by Robin at 20241114 2024-11-14 16:30:59 +08:00
Leufolium e57a2e4f55 by Robin at 20241113 2024-11-13 15:32:59 +08:00
chenhao 570d26463f Merge pull request '1' (#794) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/794
2024-11-12 18:05:35 +08:00
Leufolium 49f0c03e70 1 2024-11-12 18:04:44 +08:00
chenhao f74a126912 Merge pull request 'feat-IRONFANS-212-Robin' (#793) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/793
2024-11-12 17:38:29 +08:00
Leufolium 9277356df2 by Robin at 20241112 2024-11-12 17:37:18 +08:00
Leufolium 4606b327c5 Merge branch 'feat-IRONFANS-238-Robin' into feat-IRONFANS-212-Robin 2024-11-12 16:36:26 +08:00
Leufolium 0870b550b8 by Robin at 20241112 2024-11-12 16:34:26 +08:00
Leufolium b5f5a81915 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-11 15:17:31 +08:00
chenhao fa91563548 Merge pull request 'by Robin at 20241111' (#789) from feat-IRONFANS-238-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/789
2024-11-11 13:46:32 +08:00
chenhao 76935fed75 Merge pull request '1' (#788) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/788
2024-11-11 13:46:08 +08:00
Leufolium 14e4a6b09b 1 2024-11-11 13:45:37 +08:00
chenhao 498600ae10 Merge pull request 'feat-IRONFANS-212-Robin' (#786) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/786
2024-11-11 13:42:23 +08:00
Leufolium 7ab72de288 1 2024-11-11 13:41:58 +08:00
Leufolium 43fd646524 by Robin at 20241111 2024-11-11 13:34:25 +08:00
Leufolium 06cf21e8d6 by Robin at 20241108; curry 2024-11-08 16:30:02 +08:00
chenhao 90583d5110 Merge pull request '1' (#784) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/784
2024-11-08 11:20:18 +08:00
Leufolium 18f1a9156c 1 2024-11-08 11:20:02 +08:00
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +08:00
Leufolium 6706183f44 by Robin at 20241107 2024-11-07 17:20:34 +08:00
Leufolium 9b830999aa by Robin at 20241107 2024-11-07 17:05:13 +08:00
Leufolium 521d7694c2 by Robin at 20241107 2024-11-07 12:48:43 +08:00
Leufolium 0d0414b344 by Robin at 20241106 2024-11-06 17:37:46 +08:00
Leufolium 5954bea877 by Robin at 20241106 2024-11-06 13:50:29 +08:00
Leufolium eb611cb964 1 2024-11-05 16:33:40 +08:00
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +08:00
Leufolium 0277f51c12 Merge remote-tracking branch 'origin/main' into mtest 1 2024-11-01 16:28:07 +08:00
Leufolium 1abe2c1cfb by Robin at 20241101 2024-11-01 16:09:59 +08:00
Leufolium 680cefa724 1 2024-11-01 15:35:45 +08:00
Leufolium 5bad31df47 Merge branch 'feat-IRONFANS-212-Robin' into conf-IRONFANS-212 2024-10-29 14:59:50 +08:00
Leufolium 8fdac4d4f2 by Robin at 20241029 2024-10-29 14:57:22 +08:00
lwl0608 5ab1402ca2 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-24 20:25:39 +08:00
lwl0608 c75543c9e6 add VO price_list 2024-10-24 20:25:30 +08:00
Leufolium b1e1ef2db9 Merge branch 'feat-IRONFANS-231-Robin' into main-IRONFANS-231 2024-10-22 16:01:05 +08:00
chenhao bd8652f824 Merge pull request 'feat-IRONFANS-231-Robin' (#769) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/769
2024-10-22 15:53:56 +08:00
Leufolium 493ab2ac56 1 2024-10-22 15:53:16 +08:00
Leufolium cb91af63e3 Merge branch 'feat-IRONFANS-231-Robin' into conflict-IRONFANS-231 2024-10-22 15:38:23 +08:00