Commit Graph

1293 Commits

Author SHA1 Message Date
lwl0608 4bf3a744b3 本周迭代 2024-05-14 10:55:49 +08:00
lwl0608 a9f7be9f7b merge 2024-05-14 09:56:16 +08:00
lwl0608 77bb52fe88 create_order 2024-05-14 09:52:23 +08:00
chenhao 36cc467854 Merge pull request 'feat-IRONFANS-117-Robin' (#428) from feat-IRONFANS-117-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/428
2024-05-13 12:28:45 +08:00
chenhao 5ffd2d6085 Merge pull request 'by Robin at 20240512' (#427) from feat-IRONFANS-114-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/427
2024-05-12 16:16:43 +08:00
Leufolium 5cf69a9244 by Robin at 20240512 2024-05-12 16:16:14 +08:00
Leufolium f6ee79f147 by Robin at 20240511 2024-05-11 19:29:33 +08:00
chenhao 614467a5c3 Merge pull request 'by Robin at 20240511' (#426) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/426
2024-05-11 18:22:56 +08:00
Leufolium f7f6535cc0 by Robin at 20240511 2024-05-11 18:22:17 +08:00
Leufolium 9fb394d82a by Robin at 20240511 2024-05-11 11:34:37 +08:00
Leufolium 7064b771e2 by Robin at 20240511 2024-05-11 11:30:05 +08:00
Leufolium 2c9e1cdb91 by Robin at 20240511 2024-05-11 10:22:32 +08:00
Leufolium 5c0057d98f by Robin at 20240511 2024-05-11 10:16:35 +08:00
lwl0608 8035970300 w 2024-05-11 00:04:34 +08:00
lwl0608 22b28535a8 w 2024-05-11 00:04:06 +08:00
lwl0608 7d0f3fd46e isWithdrawAnyDiasEnable 2024-05-10 23:51:50 +08:00
lwl0608 95ef64760d isWithdrawAnyDiasEnable 2024-05-10 23:51:35 +08:00
chenhao ea48594fc9 Merge pull request 'by Robin at 20240510' (#425) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/425
2024-05-10 22:36:30 +08:00
Leufolium 77efdcc607 by Robin at 20240510 2024-05-10 22:35:27 +08:00
chenhao 1659bace4e Merge pull request 'main' (#424) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/424
2024-05-10 22:26:59 +08:00
Leufolium 0ef3755334 Merge branch 'main' into feat-IRONFANS-117-Robin 2024-05-10 18:56:35 +08:00
Leufolium 828447ed3f by Robin at 20240510 2024-05-10 18:46:52 +08:00
Leufolium c3c313dfa6 by Robin at 20240510 2024-05-10 18:13:57 +08:00
Leufolium d1fcc7da5c by Robin at 20240510 2024-05-10 18:11:36 +08:00
Leufolium c13973cd60 by Robin at 20240510 2024-05-10 15:40:09 +08:00
lwl0608 bd3d8c7e0f merge 2024-05-10 14:35:16 +08:00
lwl0608 e1c738aefb all chagne hw cdn 2024-05-10 14:33:13 +08:00
adminwishpal 4bef50e26a Merge pull request 'add withdraw' (#422) from dev-lwl/fix_witdraw into main
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/422
2024-05-10 10:19:47 +08:00
lwl0608 e7c977660d Merge branch 'dev-lwl/fix_witdraw' into test 2024-05-10 10:17:21 +08:00
lwl0608 6a7ff7a8ff add withdraw 2024-05-10 10:17:07 +08:00
lwl0608 48a728c345 Merge branch 'dev-lwl/refund_coin_order' into test 2024-05-09 20:30:42 +08:00
lwl0608 f11e7e15ae fix price 2024-05-09 20:30:20 +08:00
lwl0608 b7c274feec Merge branch 'dev-lwl/refund_coin_order' into test 2024-05-09 19:54:14 +08:00
lwl0608 ef3a1dde14 fix price 2024-05-09 19:53:19 +08:00
chenhao d9f71bd85c Merge pull request 'feat-IRONFANS-114-Robin' (#421) from feat-IRONFANS-114-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/421
2024-05-09 19:02:28 +08:00
chenhao 66ccd3aa64 Merge pull request 'by Robin at 20240509' (#420) from feat-IRONFANS-114-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/420
2024-05-09 18:07:29 +08:00
Leufolium 06227bd983 by Robin at 20240509 2024-05-09 18:07:05 +08:00
chenhao 8911f7ba1b Merge pull request 'conflict' (#419) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/419
2024-05-09 17:29:06 +08:00
Leufolium ec8e81a745 Merge remote-tracking branch 'origin/feat-IRONFANS-114-Robin' into conflict 2024-05-09 17:28:37 +08:00
Leufolium 67851d0dae by Robin at 20240509 2024-05-09 17:24:56 +08:00
lwl0608 a09f537ec1 hw to 80 2024-05-09 09:17:11 +08:00
Leufolium edc907aadb by Robin at 20240509 2024-05-09 01:55:43 +08:00
Leufolium 56ceb91a45 Merge branch 'main' of http://121.41.31.146:3000/wishpal_ironfan/service 2024-05-09 01:19:15 +08:00
Leufolium 55c62a8fda by Robin at 20240509 2024-05-09 01:19:14 +08:00
lwl0608 1142fde845 change mongo 2024-05-09 00:33:30 +08:00
chenhao b03da72f93 Merge pull request 'by Robin at 20240509' (#416) from BUG-RELATION-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/416
2024-05-09 00:06:13 +08:00
chenhao 283704cd81 Merge pull request 'by Robin at 20240509' (#415) from BUG-RELATION-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/415
2024-05-09 00:02:34 +08:00
Leufolium ed70c08149 by Robin at 20240509 2024-05-09 00:02:16 +08:00
chenhao ae26ca61b5 Merge pull request 'feat-IRONFANS-112-Robin' (#414) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/414
2024-05-08 22:55:36 +08:00
Leufolium 0614fd84e2 by Robin at 20240508 2024-05-08 22:55:15 +08:00