Commit Graph

600 Commits

Author SHA1 Message Date
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
Leufolium 461a741c2c by Robin at 20241022 2024-10-22 15:36:18 +08:00
Leufolium 5e96d99441 Merge branch 'feat-IRONFANS-212-Robin' into conflict-IRONFANS-212 2024-10-22 13:30:35 +08:00
Leufolium 02ca375de8 1 2024-10-22 11:53:59 +08:00
Leufolium a5f6c2d931 by Robin at 20241021 2024-10-21 16:07:56 +08:00
Leufolium c3fa461b9a 1 2024-10-21 14:36:01 +08:00
Leufolium b5979089b9 by Robin at 20241018 2024-10-18 16:41:06 +08:00
Leufolium 9ca3ba48dc Merge remote-tracking branch 'origin/feat-IRONFANS-231-Robin' into release-20241017 2024-10-17 20:25:25 +08:00
Leufolium 50df41672d Merge branch 'feat-IRONFANS-210-Robin' into release-20241017 2024-10-17 20:24:15 +08:00
chenhao c60194c221 Merge pull request 'conf-IRONFANS-210' (#760) from conf-IRONFANS-210 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/760
2024-10-17 11:24:56 +08:00
Leufolium 2df2341e6b Merge branch 'feat-IRONFANS-210-Robin' into conf-IRONFANS-210 2024-10-17 11:24:22 +08:00
Leufolium ee3a73d695 by Robin at 20241017 2024-10-17 11:22:49 +08:00
chenhao c537d82329 Merge pull request '1' (#758) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/758
2024-10-16 17:44:11 +08:00
Leufolium 055bbcdf82 1 2024-10-16 17:43:52 +08:00
Leufolium 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32:52 +08:00
Leufolium d9902a3f60 1 2024-10-16 17:30:15 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +08:00
Leufolium efb929e7ac by Robin at 20241015 2024-10-15 15:11:14 +08:00
Leufolium 357ee2a3be 1 2024-10-14 13:39:19 +08:00
lwl0608 c72f0555a1 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-12 16:34:07 +08:00
lwl0608 a1a414d6da fix 2024-10-12 16:33:58 +08:00
Leufolium 5295ffb251 Merge branch 'feat-IRONFANS-229-Robin' into conflict 2024-10-11 15:26:52 +08:00
Leufolium d1921bdab5 by Robin at 20241011 2024-10-11 15:24:06 +08:00