Commit Graph

1548 Commits

Author SHA1 Message Date
lwl0608 30db4e8570 Merge branch 'dev_fi_xxx' into test 2024-11-11 21:23:40 +08:00
lwl0608 12c2fd4838 fix 2024-11-11 21:23:31 +08:00
Leufolium d8e3be1fc7 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-11 15:25:43 +08:00
Leufolium b5f5a81915 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-11 15:17:31 +08:00
Leufolium 1de4fba176 1 2024-11-11 15:12:48 +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 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
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 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
Leufolium e1bd39e683 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-11-07 18:56:23 +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 2cde89a882 Merge remote-tracking branch 'origin/main' into test 2024-11-05 21:30:16 +08:00
Leufolium ba0a510301 1 2024-11-05 21:22:17 +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
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
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
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
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
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
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 7b442442b7 1 2024-10-21 16:08:28 +08:00
Leufolium a5f6c2d931 by Robin at 20241021 2024-10-21 16:07:56 +08:00