Commit Graph

393 Commits

Author SHA1 Message Date
chenhao 00ddad4ff5 Merge pull request '1' (#870) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/870
2024-12-04 17:01:52 +08:00
Robin b1f3ed40a9 1 2024-12-04 17:01:34 +08:00
chenhao b9de1a1f58 Merge pull request 'by Robin at 20241204' (#869) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/869
2024-12-04 16:56:16 +08:00
Robin b9f7164a33 by Robin at 20241204 2024-12-04 16:55:33 +08:00
Robin d3a93f0fbc Merge branch 'feat-IRONFANS-212-Robin' into test 2024-12-03 14:53:14 +08:00
Robin 495980a255 by Robin at 20241203 2024-12-03 14:52:07 +08:00
lwl0608 d5bfc13133 Merge branch 'dev-lwl/firenze' into test 2024-12-03 12:20:46 +08:00
lwl0608 fd87db0c61 fix 2024-12-03 12:20:34 +08:00
Robin 7d82065430 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-26 16:31:36 +08:00
Robin 2a5cf59a19 1 2024-11-25 17:25:46 +08:00
Robin 34759baafc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-25 17:12:59 +08:00
lwl0608 2e59c673b6 Merge branch 'dev-lwl/firenze' into test 2024-11-25 17:08:35 +08:00
lwl0608 f4380e6b52 firenze 2024-11-25 17:08:00 +08:00
Robin fd0142a96a Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:24:18 +08:00
Robin 10c733b972 by Robin at 20241125; guild registration 2024-11-25 15:15:29 +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 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 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
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 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 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 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 0d0414b344 by Robin at 20241106 2024-11-06 17:37:46 +08:00
Leufolium 1d5f40b802 1 2024-11-04 18:26:51 +08:00
Leufolium 680cefa724 1 2024-11-01 15:35:45 +08:00
Leufolium 5e96d99441 Merge branch 'feat-IRONFANS-212-Robin' into conflict-IRONFANS-212 2024-10-22 13:30:35 +08:00
Leufolium 66ed43e94c Merge remote-tracking branch 'origin/main' into test 2024-10-21 16:27:35 +08:00
lwl0608 7f5c23d3e5 alipay rate 2024-10-18 21:23:46 +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
Leufolium 5b8d2ffdce 1 2024-10-17 20:05:31 +08:00
Leufolium 9d9209be23 by Robin at 20241017; notif center logic 2024-10-17 15:51:27 +08:00
Leufolium 76574c4e18 Merge branch 'feat-IRONFANS-231-Robin' into conf-IRONFANS-231 2024-10-16 17:32:52 +08:00
Leufolium d5afd82eb2 By Robin at 20241016 2024-10-16 17:25:37 +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