Commit Graph

860 Commits

Author SHA1 Message Date
Leufolium 3fef23d3c3 by Robin at 20240425 2024-04-25 10:01:34 +08:00
lwl0608 8323f3917a Merge branch 'feat-IRONFANS-70' into test 2024-04-24 22:35:17 +08:00
lwl0608 cd840f36e4 refund 2024-04-24 22:35:00 +08:00
lwl0608 61186228de Merge branch 'feat-IRONFANS-70' into test 2024-04-24 22:24:58 +08:00
lwl0608 327a38177f fix 2024-04-24 22:24:51 +08:00
lwl0608 fa07d9ec5e Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:42:38 +08:00
lwl0608 49c31aa9ce fix 2024-04-24 21:42:31 +08:00
lwl0608 4862d2d7a1 Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:39:54 +08:00
lwl0608 c355c74390 fix 2024-04-24 21:39:47 +08:00
lwl0608 87fe741ebc Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:20:44 +08:00
lwl0608 4da4ca70d1 get zone by mid 2024-04-24 21:20:31 +08:00
chenhao 41aa31cb23 Merge pull request 'feat-IRONFANS-70' (#328) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/328
2024-04-24 20:17:38 +08:00
chenhao 2a84d99b65 Merge pull request 'by Robin at 20240424' (#327) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/327
2024-04-24 20:17:18 +08:00
Leufolium 5d7220246e by Robin at 20240424 2024-04-24 20:16:22 +08:00
lwl0608 3ae3423683 Merge branch 'feat-IRONFANS-70' into test 2024-04-24 19:37:34 +08:00
lwl0608 f4dd7158e1 add incomlist log 2024-04-24 19:36:01 +08:00
lwl0608 b62ead3be5 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 19:08:54 +08:00
lwl0608 6e83930c9e fix 2024-04-23 19:08:45 +08:00
chenhao 34fa0c622f Merge pull request 'feat-IRONFANS-70' (#326) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/326
2024-04-23 18:32:24 +08:00
chenhao d48d695310 Merge pull request 'by Robin at 20240422' (#325) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/325
2024-04-23 18:32:13 +08:00
Leufolium 1966a42d28 by Robin at 20240422 2024-04-23 18:30:28 +08:00
lwl0608 58c2692eb8 fix coin order 2024-04-23 17:39:42 +08:00
lwl0608 829fc08066 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:32:45 +08:00
lwl0608 2860992cba fix in error 2024-04-23 17:32:29 +08:00
lwl0608 bb558dc638 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:29:36 +08:00
lwl0608 561afa8755 fix tx 2024-04-23 17:29:27 +08:00
lwl0608 77bfb2e1d5 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:22:58 +08:00
lwl0608 9cd894a47b fix chaofen song weixin 2024-04-23 17:22:47 +08:00
lwl0608 3b3d47eef6 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:12:51 +08:00
lwl0608 f901feadf7 fix chaofen song weixin 2024-04-23 17:12:41 +08:00
lwl0608 89ad155d56 Merge branch 'feat-IRONFANS-70' into test 2024-04-23 17:02:08 +08:00
lwl0608 8e52f92b0b add 2024-04-23 17:01:59 +08:00
lwl0608 52dba2b052 Merge branch 'feat-IRONFANS-70' into test 2024-04-22 22:09:29 +08:00
lwl0608 9600ec1b29 fix 2024-04-22 22:09:22 +08:00
lwl0608 4ad5476676 Merge branch 'feat-IRONFANS-70' into test 2024-04-22 21:58:42 +08:00
lwl0608 27ef585eb0 fix 2024-04-22 21:58:05 +08:00
lwl0608 a56b8bdaa3 Merge branch 'feat-IRONFANS-70' into test 2024-04-22 21:20:26 +08:00
lwl0608 ca924bf81a fix 2024-04-22 21:20:17 +08:00
lwl0608 8b9bc15d2f 测试环境不加token 2024-04-22 21:11:08 +08:00
chenhao 569598795e Merge pull request 'feat-IRONFANS-70' (#324) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/324
2024-04-22 20:19:52 +08:00
chenhao 5e3bcbc982 Merge pull request 'by Robin at 20240422' (#323) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/323
2024-04-22 20:19:42 +08:00
Leufolium 0eef3c0aef by Robin at 20240422 2024-04-22 20:19:17 +08:00
chenhao 32dce6b2bb Merge pull request 'feat-IRONFANS-70' (#322) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/322
2024-04-22 19:44:08 +08:00
chenhao de52618be9 Merge pull request 'by Robin at 20240422' (#321) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/321
2024-04-22 19:43:59 +08:00
Leufolium b20df90243 by Robin at 20240422 2024-04-22 19:43:35 +08:00
chenhao bfc84392aa Merge pull request 'feat-IRONFANS-70' (#320) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/320
2024-04-22 19:37:08 +08:00
chenhao 484a4a5fa1 Merge pull request 'by Robin at 20240422' (#319) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/319
2024-04-22 19:36:53 +08:00
Leufolium 475132987d by Robin at 20240422 2024-04-22 19:36:30 +08:00
chenhao 7067c143de Merge pull request 'by Robin at 20240422' (#318) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/318
2024-04-22 19:21:32 +08:00
Leufolium 312c078216 by Robin at 20240422 2024-04-22 19:21:14 +08:00