wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,523 Commits 94 Branches 0 Tags 43 MiB
Commit Graph

409 Commits

Author SHA1 Message Date
lwl0608 ad7dd3b052 Merge branch 'dev-lwl/yop' into test 2024-05-27 19:37:58 +08:00
lwl0608 fe3cb342d6 fix yeepay callback 2024-05-27 19:37:52 +08:00
lwl0608 99cd5896a0 merge 2024-05-27 16:54:34 +08:00
lwl0608 f34bf3670e yop 2024-05-27 16:48:25 +08:00
chenhao 2ff7822af8 Merge pull request 'feat-IRONFANS-133-Robin' (#510) from feat-IRONFANS-133-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/510
 2024-05-27 16:28:00 +08:00
Leufolium b8a9b7e66b by Robin at 20240524 2024-05-24 04:09:24 +08:00
Leufolium e3a91eed7a by Robin at 20240524 2024-05-24 04:08:43 +08:00
Leufolium b221fa7bfb Merge branch 'feat-IRONFANS-133-Robin' into conflict 2024-05-24 03:55:36 +08:00
Leufolium c2c8125b5f by 2024-05-24 03:52:57 +08:00
chenhao 31ac9a3b98 revert 4f67673057 
revert by Robin at 20240524
 2024-05-24 03:32:04 +08:00
Leufolium 4f67673057 by Robin at 20240524 2024-05-24 03:18:12 +08:00
Leufolium 63ba534b6e by Robin at 20240523 2024-05-23 04:10:10 +08:00
chenhao 7867bdb3a8 Merge pull request 'by Robin at 20240522' (#472) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/472
 2024-05-22 23:20:50 +08:00
Leufolium a7e01c4dec by Robin at 20240522 2024-05-22 23:20:27 +08:00
Leufolium 58229ca3d1 by Robin at 20240522; separtaion of offline and online services 2024-05-22 17:14:20 +08:00
chenhao 320792b4fe Merge pull request 'by' (#470) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/470
 2024-05-21 23:31:26 +08:00
Leufolium 5247912764 by 2024-05-21 23:31:10 +08:00
Leufolium 0a287ebbfc by Robin at 20240521 2024-05-21 23:19:08 +08:00
Leufolium acb3e2fc24 Merge branch 'conf' of http://121.41.31.146:3000/wishpal_ironfan/service into conf 2024-05-21 23:16: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
Leufolium b8b228eb02 by Robin at 20240521 2024-05-21 23:12:25 +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 7c76dc449c by robin at 20240521 2024-05-21 23:06:30 +08:00
chenhao fbfaa11a0b Merge pull request 'by Robin at 20240521' (#464) from feat-IRONFANS-125-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/464
 2024-05-21 22:13:27 +08:00
Leufolium 1d2d8b1cc5 by Robin at 20240521 2024-05-21 22:12:59 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
chenhao 568d7661f7 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:34:39 +08:00
Leufolium 6ff619e386 1 2024-05-18 00:34:20 +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 16713c569f Merge branch 'dev-lwl/order' 2024-05-17 14:08:57 +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
Leufolium 3d607a52a9 by Robin at 20240516 2024-05-16 16:31:55 +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 0d6097d174 by Robin at 20240516 2024-05-16 14:07:27 +08:00
Leufolium 757ca5edc6 Merge remote-tracking branch 'origin/feat-IRONFANS-120-Robin' into conf 2024-05-15 16:32:37 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium 07b587475b by Robin at 20240515 2024-05-15 16:29:59 +08:00
Leufolium 5016e7b7be by Robin at 20240515 2024-05-15 16:07:33 +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
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 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
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
chenhao 614467a5c3 Merge pull request 'by Robin at 20240511' (#426) from feat-IRONFANS-112-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/426
 2024-05-11 18:22:56 +08:00
Leufolium f7f6535cc0 by Robin at 20240511 2024-05-11 18:22:17 +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
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
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
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
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 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 7e197f34a6 Merge branch 'dev-lwl/fix' into test 2024-05-03 02:56:55 +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
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 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 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