Commit Graph

416 Commits

Author SHA1 Message Date
chenhao f7ae3aa297 Merge pull request 'by Robin at 20240425' (#335) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/335
2024-04-25 17:53:35 +08:00
Leufolium 7a9f955262 by Robin at 20240425 2024-04-25 17:53:14 +08:00
lwl0608 6dca251071 fix income stype 2024-04-25 17:48:52 +08:00
chenhao 2890f1e498 Merge pull request 'by Robin at 20240425' (#333) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/333
2024-04-25 17:21:01 +08:00
Leufolium 8f574d73fb by Robin at 20240425 2024-04-25 17:20:35 +08:00
lwl0608 88b4c917c6 fix calc 2024-04-25 16:44:50 +08:00
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 7e5c721c97 fix 2024-04-25 15:28:25 +08:00
lwl0608 8950b008e6 add log 2024-04-25 15:16:59 +08:00
lwl0608 01e4bfcd8c fix refund_status 2024-04-25 15:12:22 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 4fb56ba1cc add 2024-04-25 14:36:53 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +08:00
lwl0608 25410368f5 order 2024-04-25 10:06:28 +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 cd840f36e4 refund 2024-04-24 22:35:00 +08:00
lwl0608 49c31aa9ce fix 2024-04-24 21:42:31 +08:00
lwl0608 c355c74390 fix 2024-04-24 21:39:47 +08:00
lwl0608 4da4ca70d1 get zone by mid 2024-04-24 21:20:31 +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 f4dd7158e1 add incomlist log 2024-04-24 19:36:01 +08:00
lwl0608 6e83930c9e fix 2024-04-23 19:08:45 +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 2860992cba fix in error 2024-04-23 17:32:29 +08:00
lwl0608 561afa8755 fix tx 2024-04-23 17:29:27 +08:00
lwl0608 9cd894a47b fix chaofen song weixin 2024-04-23 17:22:47 +08:00
lwl0608 f901feadf7 fix chaofen song weixin 2024-04-23 17:12:41 +08:00
lwl0608 8e52f92b0b add 2024-04-23 17:01:59 +08:00
lwl0608 9600ec1b29 fix 2024-04-22 22:09:22 +08:00
lwl0608 ca924bf81a fix 2024-04-22 21:20:17 +08:00
Leufolium 0eef3c0aef by Robin at 20240422 2024-04-22 20:19:17 +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
chenhao 71ccf53d70 Merge pull request 'by Robin at 20240422' (#316) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/316
2024-04-22 18:57:12 +08:00
Leufolium 50fa5e32b7 by Robin at 20240422 2024-04-22 18:56:53 +08:00
chenhao d074023584 Merge pull request 'by Robin at 20240422' (#314) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/314
2024-04-22 18:34:06 +08:00
Leufolium bf1de24bcd by Robin at 20240422 2024-04-22 18:33:40 +08:00
chenhao 796e09af2f Merge pull request 'by Robin at 20240422' (#312) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/312
2024-04-22 18:20:36 +08:00
Leufolium ab8db00368 by Robin at 20240422 2024-04-22 18:19:37 +08:00
chenhao 78b363183b Merge pull request 'by Robin at 20240422' (#308) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/308
2024-04-22 07:18:38 +08:00
Leufolium f2c9c5a7f6 by Robin at 20240422 2024-04-22 07:18:23 +08:00
chenhao a5837da513 Merge pull request 'by Robin at 20240422' (#306) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/306
2024-04-22 07:16:39 +08:00
Leufolium f0074facd9 by Robin at 20240422 2024-04-22 07:15:46 +08:00