Commit Graph

378 Commits

Author SHA1 Message Date
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
Leufolium 57f1775a2c by Robin at 20241015 2024-10-15 16:02:08 +08:00
lwl0608 c25e1ea623 Merge branch 'dev_tx_cdn' 2024-09-27 11:03:02 +08:00
lwl0608 cff16c7d1e tx cdn full 2024-09-27 11:02:06 +08:00
Leufolium 8af9117ba1 1 2024-09-25 13:25:09 +08:00
Leufolium 1940ea3524 Merge branch 'feat-IRONFANS-218-Robin' into confsms 2024-09-25 13:25:04 +08:00
Leufolium d1b38d53c2 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-218-Robin 2024-09-25 13:18:50 +08:00
Leufolium b1e531ce6f by Robin at 20240925 2024-09-25 13:13:35 +08:00
lwl0608 3a982826ed tx cdn 2024-09-25 00:45:26 +08:00
lwl0608 b555fb50fb fix cdn tx 2024-09-24 14:07:36 +08:00
lwl0608 c935cc2400 Merge branch 'dev_lwl' into test 2024-09-12 15:46:32 +08:00
lwl0608 ae710ffbc9 fix alipay rate 2024-09-12 15:46:22 +08:00
chenhao 56fe389cd4 Merge pull request 'feat-IRONFANS-205-Robin' (#729) from feat-IRONFANS-205-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/729
2024-09-11 11:29:30 +08:00
chenhao 7fa78ee5d9 Merge pull request 'feat-IRONFANS-210-Robin' (#728) from feat-IRONFANS-210-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/728
2024-09-11 11:29:13 +08:00
Leufolium 46130b15fc by Robin at 20240911; 2024-09-11 11:27:39 +08:00
Leufolium 63cf9f1b21 by Robin at 20240911; separate 2024-09-11 11:26:43 +08:00