Commit Graph

2242 Commits

Author SHA1 Message Date
lwl0608 709c518208 Merge branch 'dev_fi_xxx' into test 2024-11-09 11:48:07 +08:00
lwl0608 4aa8185599 recover miyuantianshi 2024-11-09 11:48:02 +08:00
lwl0608 43570094e1 Merge branch 'dev_fi_xxx' into test 2024-11-08 17:08:02 +08:00
lwl0608 438c47e3e0 lanxing 02 2024-11-08 17:07:55 +08:00
lwl0608 71229486fb Merge branch 'dev_fi_xxx' into test 2024-11-08 16:40:06 +08:00
lwl0608 a1dd4cdee2 fix 2024-11-08 16:40:01 +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
chenhao 135732a173 Merge pull request 'by Robin at 20241108' (#783) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/783
2024-11-08 11:18:25 +08:00
Leufolium 747cc25edb by Robin at 20241108 2024-11-08 11:17:47 +08:00
chenhao c444b70cc0 Merge pull request 'conf-212' (#782) from conf-212 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/782
2024-11-07 18:56:52 +08:00
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +08:00
Leufolium 81d7ff3d69 1 2024-11-07 18:50:24 +08:00
Leufolium 9ee3119e61 1 2024-11-07 18:45:17 +08:00
Leufolium d0ebfd76ac 1 2024-11-07 18:44:25 +08:00
Leufolium d685855fc8 by Robin at 20241107 2024-11-07 18:25:12 +08:00
Leufolium a9f548d600 1 2024-11-07 18:22:39 +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 31d9260a5a by Robin at 20241106 2024-11-06 15:58:37 +08:00
Leufolium 5954bea877 by Robin at 20241106 2024-11-06 13:50:29 +08:00
Leufolium 2cde89a882 Merge remote-tracking branch 'origin/main' into test 2024-11-05 21:30:16 +08:00
chenhao 1325588c32 Merge pull request '1' (#779) from BUG-20241105-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/779
2024-11-05 21:22:36 +08:00
Leufolium ba0a510301 1 2024-11-05 21:22:17 +08:00
Leufolium eb611cb964 1 2024-11-05 16:33:40 +08:00
Leufolium 7a4199503d by Robin at 20241105 2024-11-05 11:44:33 +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
chenhao 70e41a15b6 Merge pull request 'by Robin at 20241101' (#778) from feat-IRONFANS-235-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/778
2024-11-01 16:21:49 +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
chenhao 6f3d4a9527 Merge pull request '1' (#776) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/776
2024-10-30 17:29:00 +08:00
Leufolium 6824ec209c 1 2024-10-30 17:28:43 +08:00
chenhao 4a50dfed50 Merge pull request 'by Robin at 20241030' (#775) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/775
2024-10-30 17:23:05 +08:00
Leufolium 7ba93214e2 by Robin at 20241030 2024-10-30 17:22:38 +08:00
chenhao bd60e02d8f Merge pull request '1' (#774) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/774
2024-10-29 17:23:19 +08:00
Leufolium 79fde24cee 1 2024-10-29 17:22:45 +08:00
chenhao d5c077efd7 Merge pull request 'conf-IRONFANS-212' (#773) from conf-IRONFANS-212 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/773
2024-10-29 15:00:20 +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
chenhao 2ec7324d45 Merge pull request 'main-IRONFANS-231' (#771) from main-IRONFANS-231 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/771
2024-10-22 16:01:23 +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 3a69a803ae 1 2024-10-22 15:53:41 +08:00
Leufolium 493ab2ac56 1 2024-10-22 15:53:16 +08:00