Commit Graph

1186 Commits

Author SHA1 Message Date
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
lwl0608 0ca0dc6e8e Merge branch 'dev-lwl/fix' 2024-05-06 23:28:38 +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 70ff50b2e1 Merge branch 'dev-lwl/fix' 2024-05-06 20:26:03 +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 5bee706532 fix panic 2024-05-06 20:23:03 +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
lwl0608 2883756d73 add hwcdn01 2024-05-06 17:36:16 +08:00
lwl0608 a0f5d94499 Merge branch 'dev-lwl/fix' 2024-05-06 14:21:00 +08:00
lwl0608 6d7802a2a1 Merge branch 'dev-lwl/fix' into test 2024-05-06 14:20:52 +08:00
lwl0608 7825f3bbf4 isvip logic 2024-05-06 14:20:43 +08:00
lwl0608 3561769427 Merge branch 'dev-lwl/fix' 2024-05-06 14:15:13 +08:00
lwl0608 0768ac950c Merge branch 'dev-lwl/fix' into test 2024-05-06 14:15:07 +08:00
lwl0608 6cf683249f unlock vip 2024-05-06 14:15:00 +08:00
lwl0608 11a104ce38 Merge branch 'dev-lwl/fix' 2024-05-06 10:43:14 +08:00
lwl0608 c13231a1d4 Merge branch 'dev-lwl/fix' into test 2024-05-06 10:43:03 +08:00
lwl0608 7aff32ca0f 日志分割,500mb 2024-05-06 10:42:54 +08:00
lwl0608 0dee9165ef Merge branch 'dev-lwl/fix' 2024-05-06 10:29:54 +08:00
lwl0608 8423865176 Merge branch 'dev-lwl/fix' into test 2024-05-06 10:29:44 +08:00
lwl0608 d34f30c8b2 取消 response 日志 2024-05-06 10:29:35 +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 b8579e8147 Merge branch 'dev-lwl/fix' into test 2024-05-05 07:08:45 +08:00