Commit Graph

2242 Commits

Author SHA1 Message Date
chenhao 742e1318b7 Merge pull request 'by Robin at 20241022' (#768) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/768
2024-10-22 15:52:31 +08:00
Leufolium c460f0974f by Robin at 20241022 2024-10-22 15:52:06 +08:00
chenhao 660267a1cd Merge pull request 'conflict-IRONFANS-231' (#767) from conflict-IRONFANS-231 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/767
2024-10-22 15:38:47 +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
lwl0608 c5bceacb14 Merge branch 'dev-lwl/unlock_opt' into test 2024-10-22 14:40:31 +08:00
lwl0608 7afa5f69fe add is_superfanship_give_wechat 2024-10-22 14:40:15 +08:00
chenhao e3bf81453b Merge pull request 'conflict-IRONFANS-212' (#765) from conflict-IRONFANS-212 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/765
2024-10-22 13:31:12 +08:00
Leufolium 5e96d99441 Merge branch 'feat-IRONFANS-212-Robin' into conflict-IRONFANS-212 2024-10-22 13:30:35 +08:00
Leufolium 5d4ff4fb54 by Robin at 20241022 2024-10-22 13:27:02 +08:00
Leufolium 02ca375de8 1 2024-10-22 11:53:59 +08:00
Leufolium 66ed43e94c Merge remote-tracking branch 'origin/main' into test 2024-10-21 16:27:35 +08:00
Leufolium 7b442442b7 1 2024-10-21 16:08:28 +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
lwl0608 7f5c23d3e5 alipay rate 2024-10-18 21:23:46 +08:00
Leufolium bcf4d6b6b3 1 2024-10-18 16:41:12 +08:00
Leufolium b5979089b9 by Robin at 20241018 2024-10-18 16:41:06 +08:00
Leufolium 4fb589541b 1 2024-10-18 10:45:27 +08:00
chenhao f75d9a3497 Merge pull request 'release-20241017' (#763) from release-20241017 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/763
2024-10-17 20:26:23 +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
Leufolium 5b8d2ffdce 1 2024-10-17 20:05:31 +08:00
chenhao 3a264e7912 Merge pull request '1' (#762) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/762
2024-10-17 20:05:20 +08:00
Leufolium 605eda4830 1 2024-10-17 20:05:06 +08:00
chenhao 02d613ced8 Merge pull request 'by Robin at 20241017' (#761) from conf-IRONFANS-210 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/761
2024-10-17 19:53:37 +08:00
Leufolium 83a984eb17 by Robin at 20241017 2024-10-17 19:52:33 +08:00
Leufolium 9ebe86919d by Robin at 20241017 2024-10-17 16:30:32 +08:00
Leufolium 9d9209be23 by Robin at 20241017; notif center logic 2024-10-17 15:51:27 +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
Leufolium f30f710981 1 2024-10-17 10:35:39 +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
chenhao 7a29452719 Merge pull request '1' (#757) from feat-IRONFANS-231-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/757
2024-10-16 17:40:42 +08:00
Leufolium 7d80e09e44 1 2024-10-16 17:40:24 +08:00
chenhao 229d9f0039 Merge pull request 'conf-IRONFANS-231' (#756) from conf-IRONFANS-231 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/756
2024-10-16 17:33:17 +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 eafb373bd4 by Robin at 20241016 2024-10-16 17:26:37 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +08:00
Leufolium 698a90904b 1 2024-10-16 15:32:17 +08:00
Leufolium 053045854d by Robin at 20241016 2024-10-16 15:32:12 +08:00
Leufolium ae74496934 1 2024-10-16 14:46:13 +08:00
Leufolium 3f10ab9330 by Robin at 20241015 2024-10-15 18:07:47 +08:00
chenhao 5307e9b30c Merge pull request 'by Robin at 20241015' (#754) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/754
2024-10-15 16:55:18 +08:00
Leufolium 8c4579d749 by Robin at 20241015 2024-10-15 16:54:43 +08:00
chenhao 7372af7040 Merge pull request 'by Robin at 20241015' (#753) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/753
2024-10-15 16:02:45 +08:00
Leufolium 57f1775a2c by Robin at 20241015 2024-10-15 16:02:08 +08:00