Commit Graph

1319 Commits

Author SHA1 Message Date
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
Leufolium cb773295f4 t 2024-05-08 22:54:05 +08:00
Leufolium 4dc6850883 by Robin at 20240508 2024-05-08 22:53:24 +08:00
chenhao 8f03f31def Merge pull request 'by Robin at 20240508' (#413) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/413
2024-05-08 20:49:26 +08:00
Leufolium 1a26469760 by Robin at 20240508 2024-05-08 20:49:11 +08:00
chenhao 8a3e7e8de9 Merge pull request 'main' (#412) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/412
2024-05-08 20:22:24 +08:00
chenhao 2cc89c5c72 Merge pull request 'by Robin at 20240508' (#411) from feat-IRONFANS-113-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/411
2024-05-08 20:22:13 +08:00
Leufolium b24a754927 by Robin at 20240508 2024-05-08 20:21:43 +08:00
lwl0608 034ea2f436 Merge branch 'dev-lwl/wx' into test 2024-05-08 09:54:30 +08:00
adminwishpal 6ee6311e27 Merge pull request 'dev-lwl/wx' (#410) from dev-lwl/wx into main
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/410
2024-05-08 09:54:11 +08:00
lwl0608 e7bd360f91 update 2024-05-08 09:53:04 +08:00
lwl0608 d901999264 add tifenzone 2024-05-08 09:53:04 +08:00
lwl0608 028a5232cd wechat 2024-05-08 09:53:04 +08:00
chenhao e81401da10 Merge pull request 'Merge pull request 'by Robin at 20240507' (#407) from feat-IRONFANS-113-Robin into main' (#409) from main into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/409
2024-05-07 22:43:57 +08:00
chenhao 6ffc4ad2b2 Merge pull request 'by Robin at 20240507' (#408) from feat-IRONFANS-113-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/408
2024-05-07 22:43:43 +08:00
chenhao 0422cb6926 Merge pull request 'by Robin at 20240507' (#407) from feat-IRONFANS-113-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/407
2024-05-07 22:43:24 +08:00
Leufolium 504b5135d7 by Robin at 20240507 2024-05-07 22:43:10 +08:00
lwl0608 aeeb97dc7c Merge branch 'dev-lwl/wx' into test 2024-05-07 19:25:11 +08:00
lwl0608 af9aae9551 add tifenzone 2024-05-07 19:24:47 +08:00
chenhao 03b00506dc Merge pull request 'by Robin at 20240507; set is_hided for zone third partner' (#406) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/406
2024-05-07 16:59:29 +08:00
Leufolium 7b385f395d by Robin at 20240507; set is_hided for zone third partner 2024-05-07 16:59:10 +08:00
chenhao 67d3547db8 Merge pull request 'by Robin at 20240507; is_hided for third partner' (#405) from feat-IRONFANS-112-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/405
2024-05-07 16:34:12 +08:00
Leufolium 099230a6ba by Robin at 20240507; is_hided for third partner 2024-05-07 16:33:55 +08:00
lwl0608 f247f2ddc1 merge 2024-05-07 10:51:11 +08:00
lwl0608 5aab80fcdd add media op 2024-05-07 10:50:40 +08:00