wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,319 Commits 84 Branches 0 Tags 35 MiB
Commit Graph

913 Commits

Author SHA1 Message Date
lwl0608 698ad85bf0 fix 2024-05-15 14:22:54 +08:00
lwl0608 534fe16e05 fix 2024-05-15 14:21:01 +08:00
lwl0608 83f659df3a Merge branch 'dev-lwl/with' into test 2024-05-15 12:40:33 +08:00
lwl0608 c12b1e1164 fix 2024-05-15 12:40:21 +08:00
Leufolium 0e6368fc0c by Robin at 20240515 2024-05-15 12:13:02 +08:00
lwl0608 b6e45575ff merge 2024-05-15 10:22:18 +08:00
lwl0608 936929b0ec fix moment_order_list 2024-05-15 10:21:18 +08:00
Leufolium 7107bb0393 by Robin at 20240515 2024-05-15 09:58:45 +08:00
chenhao 6dc7bf2d66 Merge pull request 'by Robin at 20240514' (#439) from feat-IRONFANS-121-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/439
 2024-05-15 08:41:58 +08:00
chenhao dbc5d4f9c4 Merge pull request 'feat-IRONFANS-117-Robin' (#438) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/438
 2024-05-14 23:02:19 +08:00
Leufolium 211bd4ba79 by Robin at 20240514 2024-05-14 23:01:58 +08:00
Leufolium a523664f3a by Robin at 20240514 2024-05-14 22:58:12 +08:00
chenhao 75338ff450 Merge pull request 'by Robin at 20240514' (#436) from feat-IRONFANS-117-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/436
 2024-05-14 22:44:12 +08:00
Leufolium 7ab0b8ae82 by Robin at 20240514 2024-05-14 22:43:52 +08:00
Leufolium a94e614427 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into conflict 2024-05-14 22:34:15 +08:00
Leufolium 4077eb2380 by Robin at 20240514 2024-05-14 22:31:33 +08:00
chenhao c63219ac5c Merge pull request 'main' (#433) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/433
 2024-05-14 20:48:08 +08:00
chenhao e44b89cee8 Merge pull request 'by Robin at 20240514' (#432) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/432
 2024-05-14 20:47:34 +08:00
Leufolium 4130795c11 by Robin at 20240514 2024-05-14 20:47:20 +08:00
chenhao 69a67c1221 Merge pull request 'main' (#431) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/431
 2024-05-14 20:36:36 +08:00
chenhao df70260ddc Merge pull request 'by Robin at 20240514' (#430) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/430
 2024-05-14 20:36:27 +08:00
Leufolium 1293757049 by Robin at 20240514 2024-05-14 20:36:01 +08:00
chenhao 1c6cfa8874 Merge pull request 'by Robin at 20240514' (#429) from feat-IRONFANS-121-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/429
 2024-05-14 17:23:12 +08:00
Leufolium 3dc9ca1665 by Robin at 20240514 2024-05-14 17:22:40 +08:00
lwl0608 961f37af1b fix 2024-05-14 10:58:07 +08:00
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
Leufolium 9fb394d82a by Robin at 20240511 2024-05-11 11:34:37 +08:00
Leufolium 2c9e1cdb91 by Robin at 20240511 2024-05-11 10:22:32 +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
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 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
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
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
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
chenhao e7ade6e7cf Merge pull request 'by Robin at 20240501' (#399) from feat-IRONFANS-104-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/399
 2024-05-01 04:32:30 +08:00
Leufolium 7317ea2a65 by Robin at 20240501 2024-05-01 04:32:09 +08:00
chenhao 8e53a7ec84 Merge pull request 'feat-IRONFANS-70' (#397) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/397
 2024-05-01 04:09:53 +08:00
Leufolium d8527b01b1 BY 2024-05-01 04:09:27 +08:00
Leufolium 138a8da41d by RObin at 2024-05-01 04:01:58 +08:00
chenhao 83b4ed0320 Merge pull request 'by Robin at 20240501' (#396) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/396
 2024-05-01 03:53:15 +08:00
Leufolium 74e6f9a9f5 by Robin at 20240501 2024-05-01 03:52:59 +08:00
chenhao a0dac18ede Merge pull request 'feat-IRONFANS-70' (#395) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/395
 2024-05-01 03:28:28 +08:00
Leufolium c82974fadf Merge remote-tracking branch 'origin/main' into conf 2024-05-01 03:27:04 +08:00
Leufolium 6824e26e90 by Robin at 20240501 2024-05-01 03:22:06 +08:00
Leufolium d494eb921b by Robin at 20240501 2024-05-01 02:51:47 +08:00
chenhao e2501b7022 Merge pull request 'by Robin at 20240501' (#390) from feat-IRONFANS-86-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/390
 2024-05-01 01:11:22 +08:00
Leufolium d642ca7dc0 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-05-01 01:11:00 +08:00
Leufolium 6158600853 by Robin at 20240501 2024-05-01 01:04:50 +08:00
Leufolium 7e71e670c0 Merge branch 'feat-IRONFANS-70' into conflict 2024-04-30 09:52:51 +08:00
Leufolium 1ac73882d1 by Robin at 20240430 2024-04-30 09:51:23 +08:00
Leufolium aa32674ed3 by Robin at 20240430 2024-04-30 09:40:19 +08:00
chenhao b0fc62679e Merge pull request 'by Robin at 20240430' (#385) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/385
 2024-04-30 09:23:24 +08:00
Leufolium 7f18d00df4 by Robin at 20240430 2024-04-30 09:22:18 +08:00
chenhao edbcabb372 Merge pull request 'feat-IRONFANS-86-Robin' (#384) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/384
 2024-04-29 22:37:25 +08:00
chenhao a3c29a0c6b Merge pull request 'feat-IRONFANS-86-Robin' (#383) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/383
 2024-04-29 22:37:06 +08:00
Leufolium 07aff915c0 b 2024-04-29 22:36:45 +08:00
chenhao c366a96735 Merge pull request 'by Robin at 20240429' (#381) from feat-IRONFANS-86-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/381
 2024-04-29 22:32:32 +08:00
chenhao 9356387298 Merge pull request 'by Robin at 20240429' (#380) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/380
 2024-04-29 22:32:05 +08:00
Leufolium bd0fb55e8e by Robin at 20240429 2024-04-29 22:31:27 +08:00
chenhao bee0278f38 Merge pull request 'by Robin at 20240429' (#379) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/379
 2024-04-29 22:21:38 +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
Leufolium 86bc5933e4 by Robin at 20240429 2024-04-29 22:17:19 +08:00
lwl0608 0e8beef47b Merge branch 'dev-lwl/zone' into test 2024-04-29 17:53:01 +08:00
lwl0608 924656e8ed contact 2024-04-29 17:52:52 +08:00
lwl0608 3dc8a84b7c Merge branch 'dev-lwl/zone' into test 2024-04-29 17:39:59 +08:00
lwl0608 715ff91c51 zone_refund_list 2024-04-29 17:39:49 +08:00
lwl0608 9e4a6e744a Merge branch 'dev-lwl/zone' into test 2024-04-29 16:25:30 +08:00
lwl0608 f12a1ad2a2 fix coin order 2024-04-29 16:24:59 +08:00
lwl0608 f575f381e6 fix coin order 2024-04-29 16:23:03 +08:00
lwl0608 1b17cf1a79 Merge branch 'dev-lwl/zone' into test 2024-04-29 16:08:59 +08:00
lwl0608 cc7a910b72 fix zone ferund 2024-04-29 16:08:51 +08:00
lwl0608 31c2dc1039 Merge branch 'dev-lwl/zone' into test 2024-04-29 15:56:49 +08:00
lwl0608 a8d3a45b71 rollback ironfanship 2024-04-29 15:56:42 +08:00
lwl0608 1bd1cfd161 Merge branch 'dev-lwl/zone' into test 2024-04-29 15:47:56 +08:00
lwl0608 c470a8e77f add zone refund 2024-04-29 15:47:45 +08:00
chenhao 8ae3052741 Merge pull request 'feat-IRONFANS-86-Robin' (#377) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/377
 2024-04-29 15:32:43 +08:00