Commit Graph

175 Commits

Author SHA1 Message Date
Leufolium cddc6fe29a Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-23 04:12:37 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
Leufolium 5cd103dac2 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin-2' into conf 2024-05-21 23:15:47 +08:00
chenhao 36338ff2e8 by Robin at 20240521 2024-05-21 23:11:45 +08:00
chenhao 3ff0b4ed87 by Robin at 20240516 2024-05-21 23:06:48 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
chenhao 73be110ca6 Merge pull request 'by Robin at 20240518' (#454) from feat-IRONFANS-120-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/454
2024-05-18 00:13:38 +08:00
Leufolium 853d231a9f by Robin at 20240518 2024-05-18 00:12:54 +08:00
Leufolium d089f30fb4 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517 2024-05-17 16:17:46 +08:00
Leufolium f7c25ae1cc Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into release-20240517 2024-05-17 16:12:41 +08:00
chenhao f8775c6d17 Merge pull request 'feat-IRONFANS-112-Robin' (#448) from feat-IRONFANS-112-Robin into release-20240517
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/448
2024-05-17 16:10:50 +08:00
lwl0608 6a1db908d2 fix 2024-05-17 14:08:15 +08:00
lwl0608 6a975818f7 merge 2024-05-16 21:08:42 +08:00
lwl0608 65152f30a7 add 2024-05-16 19:59:10 +08:00
Leufolium 54732df0d4 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-16 18:17:14 +08:00
Leufolium cee2242bc8 by Robin at 20240516 2024-05-16 18:15:03 +08:00
chenhao 1ddcca1b33 Merge pull request 'feat-IRONFANS-120-Robin' (#444) from feat-IRONFANS-120-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/444
2024-05-16 14:40:50 +08:00
Leufolium 3a3c50f851 by Robin at 20240516 2024-05-16 14:40:22 +08:00
Leufolium 757ca5edc6 Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf 2024-05-15 16:32:37 +08:00
Leufolium 07b587475b by Robin at 20240515 2024-05-15 16:29:59 +08:00
Leufolium 0e6368fc0c by Robin at 20240515 2024-05-15 12:13:02 +08:00
Leufolium 7107bb0393 by Robin at 20240515 2024-05-15 09:58:45 +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
Leufolium f6ee79f147 by Robin at 20240511 2024-05-11 19:29:33 +08:00
Leufolium 7064b771e2 by Robin at 20240511 2024-05-11 11:30:05 +08:00
lwl0608 7d0f3fd46e isWithdrawAnyDiasEnable 2024-05-10 23:51:50 +08:00
lwl0608 95ef64760d isWithdrawAnyDiasEnable 2024-05-10 23:51:35 +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
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 1142fde845 change mongo 2024-05-09 00:33:30 +08:00
lwl0608 d901999264 add tifenzone 2024-05-08 09:53:04 +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
Leufolium 099230a6ba by Robin at 20240507; is_hided for third partner 2024-05-07 16:33:55 +08:00
lwl0608 5aab80fcdd add media op 2024-05-07 10:50:40 +08:00
lwl0608 4bc9900fbd fix zone VIP 2024-05-06 17:56:39 +08:00
lwl0608 a0f5d94499 Merge branch 'dev-lwl/fix' 2024-05-06 14:21:00 +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 6cf683249f unlock vip 2024-05-06 14:15:00 +08:00
Leufolium 003b669642 by Robin at 2024 2024-05-05 22:28:22 +08:00
Leufolium 2b8d9bf4bf by Robin at 20240501 2024-05-01 05:04:08 +08:00
chenhao 9c893d4a9c Merge pull request 'feat-IRONFANS-86-Robin' (#378) from feat-IRONFANS-86-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/378
2024-04-29 22:20:05 +08:00
lwl0608 924656e8ed contact 2024-04-29 17:52:52 +08:00
lwl0608 c470a8e77f add zone refund 2024-04-29 15:47:45 +08:00
Leufolium b67c503e80 by Robin at 20240429 2024-04-29 15:31:54 +08:00
Leufolium 442b84a0cd by Robin at 20240428 2024-04-28 21:26:59 +08:00
Leufolium b53a96d3bf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin 2024-04-27 08:27:34 +08:00