Commit Graph

1230 Commits

Author SHA1 Message Date
chenhao 0d6b0bce10 Merge pull request 'by Robin at 20240425' (#331) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/331
2024-04-25 16:41:01 +08:00
Leufolium 197fb8e87e by Robin at 20240425 2024-04-25 16:40:21 +08:00
lwl0608 e8aac064a1 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 16:11:04 +08:00
lwl0608 e4bc45739a add sql 2024-04-25 16:10:56 +08:00
lwl0608 85d20b02a9 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:28:32 +08:00
lwl0608 7e5c721c97 fix 2024-04-25 15:28:25 +08:00
lwl0608 ff3e66eca6 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:17:30 +08:00
lwl0608 8950b008e6 add log 2024-04-25 15:16:59 +08:00
lwl0608 4439f43169 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:12:35 +08:00
lwl0608 01e4bfcd8c fix refund_status 2024-04-25 15:12:22 +08:00
lwl0608 0f75a2f27e Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:41:46 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 67c1a7ef0e Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:37:12 +08:00
lwl0608 4fb56ba1cc add 2024-04-25 14:36:53 +08:00
lwl0608 6b3b18f31a Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:07:56 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +08:00
lwl0608 a41f626be5 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 10:06:42 +08:00
lwl0608 25410368f5 order 2024-04-25 10:06:28 +08:00
chenhao fe866863e6 Merge pull request 'feat-IRONFANS-70' (#330) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/330
2024-04-25 10:02:45 +08:00
chenhao b74f7540b8 Merge pull request 'by Robin at 20240425' (#329) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/329
2024-04-25 10:02:33 +08:00
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