Commit Graph

755 Commits

Author SHA1 Message Date
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
lwl0608 e7bd360f91 update 2024-05-08 09:53:04 +08:00
lwl0608 028a5232cd wechat 2024-05-08 09:53:04 +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
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
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
lwl0608 5542905db3 Merge branch 'dev-lwl/fix' into test 2024-05-06 23:28:29 +08:00
lwl0608 b196114623 add withdraw freeze 2024-05-06 23:28:22 +08:00
lwl0608 8bfc15b41a Merge branch 'dev-lwl/fix' into test 2024-05-06 20:25:57 +08:00
lwl0608 ef88ac4d14 fix painc 2024-05-06 20:25:49 +08:00
lwl0608 553e0203c3 Merge branch 'dev-lwl/fix' into test 2024-05-06 20:18:02 +08:00
lwl0608 2a5192c4e1 fix vip config 2024-05-06 20:17:52 +08:00
lwl0608 a4b0c010a8 Merge branch 'dev-lwl/fix' into test 2024-05-06 18:50:53 +08:00
lwl0608 e1f6f9f9d7 fix zmlist 2024-05-06 18:50:32 +08:00
lwl0608 55d7747ddb fix zmlist 2024-05-06 18:49:17 +08:00
lwl0608 79e80ac082 Merge branch 'dev-lwl/fix' into test 2024-05-06 18:02:13 +08:00
lwl0608 5ef25b96f4 fix zone VIP 2024-05-06 18:02:06 +08:00
lwl0608 42157b2ee4 Merge branch 'dev-lwl/fix' into test 2024-05-06 17:56:48 +08:00
lwl0608 4bc9900fbd fix zone VIP 2024-05-06 17:56:39 +08:00
lwl0608 d2d15c143d merge 2024-05-06 17:37:03 +08:00
chenhao 003ffda209 Merge pull request 'by Robin at 2024' (#404) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/404
2024-05-05 22:28:51 +08:00
Leufolium 003b669642 by Robin at 2024 2024-05-05 22:28:22 +08:00
lwl0608 3c3c849213 Merge branch 'dev-lwl/fix' into test 2024-05-03 19:39:38 +08:00
lwl0608 affc815e8e fix is_moment_image_encrypt_enabled 2024-05-03 19:39:29 +08:00
lwl0608 7e197f34a6 Merge branch 'dev-lwl/fix' into test 2024-05-03 02:56:55 +08:00
lwl0608 bb90fafef6 req.WechatCoinPrice 兜底 2024-05-03 02:56:32 +08:00
lwl0608 ba6d14ccc5 wechat 2024-05-03 02:26:48 +08:00
chenhao d069414106 Merge pull request 'by Robin at 20240501' (#403) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/403
2024-05-01 05:26:33 +08:00
chenhao d09aca140d Merge pull request 'by Robin at 20240501' (#402) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/402
2024-05-01 05:25:58 +08:00
Leufolium 1f394794ed by Robin at 20240501 2024-05-01 05:25:45 +08:00
chenhao 76a9e41413 Merge pull request 'by Robin at 20240501' (#401) from feat-IRONFANS-70 into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/401
2024-05-01 05:12:04 +08:00
chenhao e3ae837488 Merge pull request 'by Robin at 20240501' (#400) from feat-IRONFANS-70 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/400
2024-05-01 05:04:34 +08:00
Leufolium 2b8d9bf4bf by Robin at 20240501 2024-05-01 05:04:08 +08:00