wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,711 Commits 107 Branches 0 Tags 48 MiB
Commit Graph

1218 Commits

Author SHA1 Message Date
Leufolium ffececc65a by Robin at 20240523 2024-05-23 23:01:30 +08:00
Leufolium 6907d7c8a2 by Robin at 20240523 2024-05-23 22:47:33 +08:00
Leufolium c9fa28946f Merge branch 'feat-IRONFANS-133-Robin' into conf 2024-05-23 22:44:51 +08:00
Leufolium 124dd84c83 by Robin at 20240523 2024-05-23 22:39:37 +08:00
Leufolium 8d36ca1d37 by Robin at 20240523 2024-05-23 17:11:14 +08:00
lwl0608 7cbce259b8 fix 2024-05-23 11:34:24 +08:00
Leufolium cddc6fe29a Merge remote-tracking branch 'origin/feat-IRONFANS-133-Robin' into conflict 2024-05-23 04:12:37 +08:00
Leufolium 36f87c275e by Robin at 20240522 2024-05-22 23:35:07 +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
chenhao 40bafbb0af Merge pull request 'by Robin at 20240522' (#471) from feat-IRONFANS-118-Robin-2 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/471
 2024-05-22 22:57:14 +08:00
Leufolium 3b9f56d149 by Robin at 20240522 2024-05-22 22:56:47 +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 ab80a78cc7 by 2024-05-21 23:22:05 +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 a4cddc50c7 by Robin at 20240515 2024-05-21 22:58:09 +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
lwl0608 2d15e3bf70 ip 2024-05-21 19:58:24 +08:00
lwl0608 8107f4e4b9 fix 2024-05-21 19:57:46 +08:00
lwl0608 b2cc85ce8a fix 2024-05-21 19:57:46 +08:00
lwl0608 99f71d400b main 2024-05-21 19:57:46 +08:00
lwl0608 1a19cc2f08 fix 2024-05-21 19:57:46 +08:00
lwl0608 801fe5cbe0 fix 2024-05-21 19:57:46 +08:00
lwl0608 e84f94de68 fix log 2024-05-21 19:57:46 +08:00
lwl0608 388c5346bc revocer 2024-05-21 19:57:19 +08:00
lwl0608 5cc1fb426b fix log 2024-05-21 19:57:19 +08:00
lwl0608 0ec33fa81b consul 2024-05-21 19:57:19 +08:00
lwl0608 dc1feac378 vendor 2024-05-21 19:57:17 +08:00
lwl0608 2ae1c452b3 add 2024-05-21 19:56:53 +08:00
lwl0608 ee5585daf7 consul 2024-05-21 19:55:58 +08:00
Leufolium 9eb02d2788 Merge remote-tracking branch 'origin/feat-IRONFANS-118-Robin' into conf 2024-05-21 18:37:01 +08:00
chenhao d5f5e3f25b Merge pull request 'main' (#461) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/461
 2024-05-21 18:27:41 +08:00
Leufolium 169a34247f by Robin at 20240521 2024-05-21 18:26:30 +08:00
lwl0608 ce46abfdca Merge branch 'dev-lwl/consul' into test 2024-05-21 17:36:39 +08:00
lwl0608 0cf3101f93 ip 2024-05-21 17:36:33 +08:00
lwl0608 bf987fe8da Merge branch 'dev-lwl/consul' into test 2024-05-21 17:08:13 +08:00
lwl0608 ad7a42a0f5 fix 2024-05-21 17:08:05 +08:00
Leufolium 62ae8742ba by Robin at 20240520 2024-05-20 18:16:17 +08:00
Leufolium 5eb15ae3a1 by Robin at 20240520 2024-05-20 18:12:22 +08:00
chenhao 90d11b400e Merge pull request 'feat-IRONFANS-129-Robin' (#460) from feat-IRONFANS-129-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/460
 2024-05-20 17:42:31 +08:00
chenhao bc30b6a7f7 Merge pull request 'by Robin at 20240520' (#459) from feat-IRONFANS-129-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/459
 2024-05-20 17:32:40 +08:00
Leufolium d1b1a62b8a by Robin at 20240520 2024-05-20 17:32:12 +08:00
chenhao 0fdf2e76c0 Merge pull request 'by Robin at 20240520' (#458) from feat-IRONFANS-129-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/458
 2024-05-20 16:15:24 +08:00
Leufolium b1b95821e1 by Robin at 20240520 2024-05-20 16:15:01 +08:00
Leufolium 112125e003 Merge remote-tracking branch 'origin/feat-IRONFANS-125-Robin' into conflict 2024-05-20 15:32:57 +08:00
Leufolium 6dc26aeb1b Merge remote-tracking branch 'origin/main' into test 2024-05-20 15:31:38 +08:00
Leufolium 1f5f5b57e0 by Robin at 20240520 2024-05-20 15:29:07 +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
chenhao 3bbbeee0ab Merge pull request 'by Robin at 20240517' (#453) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/453
 2024-05-17 18:58:13 +08:00
Leufolium f0198e6e71 by Robin at 20240517 2024-05-17 18:57:41 +08:00
chenhao 24a9e2236f Merge pull request 'by Robin at 20240517' (#452) from feat-IRONFANS-120-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/452
 2024-05-17 18:42:19 +08:00
Leufolium 52e8d60715 by Robin at 20240517 2024-05-17 18:42:03 +08:00
Leufolium d089f30fb4 Merge remote-tracking branch 'origin/feat-IRONFANS-117-Robin' into release-20240517 2024-05-17 16:17:46 +08:00
lwl0608 bb825aa93a fix 2024-05-17 16:14:23 +08:00
lwl0608 dfbc547781 fix 2024-05-17 16:13:50 +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 8fbbcc803e t 2024-05-17 15:46:08 +08:00
lwl0608 08fdb35594 Merge branch 'dev-lwl/consul' into test 2024-05-17 15:30:05 +08:00
lwl0608 1fbd46bde0 main 2024-05-17 15:30:00 +08:00
lwl0608 16713c569f Merge branch 'dev-lwl/order' 2024-05-17 14:08:57 +08:00
lwl0608 6a1db908d2 fix 2024-05-17 14:08:15 +08:00
lwl0608 e9f21d42d7 Merge branch 'dev-lwl/consul' into test 2024-05-17 10:59:56 +08:00
lwl0608 0598f99bd3 fix 2024-05-17 10:59:40 +08:00
lwl0608 930e39e500 Merge branch 'dev-lwl/consul' into test 2024-05-17 10:44:54 +08:00
lwl0608 38eebe5b35 fix 2024-05-17 10:44:48 +08:00
lwl0608 61f06ac60d fix 2024-05-16 23:49:13 +08:00
lwl0608 c976b01e8a vercmp 2024-05-16 23:33:37 +08:00
lwl0608 71f4a1e200 fix log 2024-05-16 22:26:06 +08:00
lwl0608 5dc4f6fbcc Merge branch 'dev-lwl/consul' into test 2024-05-16 22:10:20 +08:00
lwl0608 090e96c90e revocer 2024-05-16 22:10:14 +08:00
lwl0608 f1166624b1 Merge branch 'dev-lwl/consul' into test 2024-05-16 21:59:51 +08:00
lwl0608 7a4312fdff fix log 2024-05-16 21:59:45 +08:00
lwl0608 6a975818f7 merge 2024-05-16 21:08:42 +08:00
lwl0608 ae822fd49c consul 2024-05-16 20:43:21 +08:00
lwl0608 65152f30a7 add 2024-05-16 19:59:10 +08:00
lwl0608 34fa94bf1f consul 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
lwl0608 3ce8ba6efb merge 2024-05-16 16:50:29 +08:00
lwl0608 a05451e99a 取消提现限制 2024-05-16 16:49:20 +08:00
Leufolium 3d607a52a9 by Robin at 20240516 2024-05-16 16:31:55 +08:00
chenhao 8e144dfd7a Merge pull request 'by Robin at 20240516' (#445) from feat-IRONFANS-120-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/445
 2024-05-16 16:00:44 +08:00
Leufolium 0c3bb46562 by Robin at 20240516 2024-05-16 16:00:20 +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
lwl0608 ca2afc7e0a Merge branch 'dev-lwl/order' into test 2024-05-15 20:01:50 +08:00
lwl0608 8ba9674a27 fix data 2024-05-15 20:01:40 +08:00
lwl0608 601ef2b715 Merge branch 'dev-lwl/order' into test 2024-05-15 19:58:18 +08:00
lwl0608 ce579b9701 add log 2024-05-15 19:57:52 +08:00
lwl0608 bc1163e806 Merge branch 'dev-lwl/order' into test 2024-05-15 19:12:38 +08:00
lwl0608 9b8b37d5e1 fix 2024-05-15 19:12: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 c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium f11b170914 by Robin at 20240515 2024-05-15 16:19:31 +08:00
Leufolium 5016e7b7be by Robin at 20240515 2024-05-15 16:07:33 +08:00
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
Leufolium b67c503e80 by Robin at 20240429 2024-04-29 15:31:54 +08:00
chenhao 419e3fb0f3 Merge pull request 'feat-IRONFANS-87-Robin' (#372) from feat-IRONFANS-87-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/372
 2024-04-28 22:03:48 +08:00
chenhao e56dd98007 Merge pull request 'feat-IRONFANS-87-Robin' (#368) from feat-IRONFANS-87-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/368
 2024-04-28 21:27:24 +08:00
Leufolium 442b84a0cd by Robin at 20240428 2024-04-28 21:26:59 +08:00
lwl0608 53bfdfe33c Merge branch 'dev-lwl/zone' into test 2024-04-28 18:00:17 +08:00
lwl0608 8db2ce1071 fix 2024-04-28 17:59:57 +08:00
lwl0608 9509d63858 Merge branch 'main' into test 2024-04-28 17:37:04 +08:00
chenhao 6bf1f9e472 Merge pull request 'by Robin at 20240427' (#367) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/367
 2024-04-27 19:50:09 +08:00
Leufolium 27cda44de3 by Robin at 20240427 2024-04-27 19:48:57 +08:00
Leufolium 3ccfbf0e76 by Robin at 20240427 2024-04-27 17:23:04 +08:00
chenhao 007cef3d1a revert 7dd5e042ca 
revert by Robin at 20240427
 2024-04-27 17:22:02 +08:00
Leufolium 7dd5e042ca by Robin at 20240427 2024-04-27 17:19:46 +08:00
chenhao 0c86d4db01 Merge pull request 'feat-IRONFANS-86-Robin' (#365) from feat-IRONFANS-86-Robin into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/365
 2024-04-27 11:17:19 +08:00
Leufolium edb5caf001 by Robin at 20240427 2024-04-27 11:14:44 +08:00
Leufolium b53a96d3bf Merge remote-tracking branch 'origin/main' into feat-IRONFANS-86-Robin 2024-04-27 08:27:34 +08:00
Leufolium acf047e66f Merge remote-tracking branch 'origin/main' into conflict 2024-04-27 08:24:56 +08:00
chenhao 1ef6478056 Merge pull request 'by Robin at 20240427' (#362) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/362
 2024-04-27 08:21:01 +08:00
Leufolium 14d86ae777 by Robin at 20240427 2024-04-27 08:20:19 +08:00
chenhao 79df3e410e Merge pull request 'feat-IRONFANS-70' (#360) from feat-IRONFANS-70 into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/360
 2024-04-27 00:48:29 +08:00
chenhao 6376fc0d48 Merge pull request 'by Robin at 20240427' (#359) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/359
 2024-04-27 00:47:36 +08:00
Leufolium 2f4a80d3fc by Robin at 20240427 2024-04-27 00:47:18 +08:00
chenhao a008fa9e86 Merge pull request 'by Robin at 20240427' (#358) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/358
 2024-04-27 00:39:49 +08:00
Leufolium 9a5968f158 by Robin at 20240427 2024-04-27 00:39:28 +08:00
chenhao 0562e5cdc5 Merge pull request 'by Robin at 20240427' (#357) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/357
 2024-04-27 00:28:34 +08:00
Leufolium 9fed951998 by Robin at 20240427 2024-04-27 00:27:53 +08:00
chenhao 7dcc739c86 Merge pull request 'by Robin at 20240426' (#356) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/356
 2024-04-26 23:02:12 +08:00
Leufolium 7cb60f01b6 by Robin at 20240426 2024-04-26 23:01:55 +08:00
lwl0608 97e3d86078 fix refund 2024-04-26 21:10:52 +08:00
Leufolium 05c247314b by Robin at 20240426 2024-04-26 19:45:20 +08:00
chenhao 3908f40305 Merge pull request 'by Robin at 20240426' (#353) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/353
 2024-04-26 14:55:18 +08:00
chenhao c922628f5a Merge pull request 'main' (#352) from main into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/352
 2024-04-26 14:55:04 +08:00
Leufolium 2ac68c47c7 by Robin at 20240426 2024-04-26 14:54:27 +08:00
chenhao 629555ad36 Merge pull request 'feat-IRONFANS-70' (#351) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/351
 2024-04-26 11:22:48 +08:00
chenhao 402b991583 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#350) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/350
 2024-04-26 11:22:33 +08:00
Leufolium 4137710945 by Robin at 20240426 2024-04-26 11:13:49 +08:00
Leufolium 3076813dfb by Robin at 20240426; rollback create times of deleted zone moment 2024-04-26 10:48:57 +08:00
Leufolium 0630bd9a18 by Robin at 20240426 2024-04-26 10:46:37 +08:00
lwl0608 30f4a9dd37 fix membership change 2024-04-26 02:27:07 +08:00
lwl0608 f80bfb3ab5 fix 2024-04-26 01:30:40 +08:00
lwl0608 60dd9b28c5 add wxpay callback manul 2024-04-26 01:29:36 +08:00
lwl0608 0f96f44c3e fix 2024-04-26 01:13:35 +08:00
lwl0608 e4d97122a1 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 19:20:07 +08:00
lwl0608 b47afa4909 fix 2024-04-25 19:19:22 +08:00
chenhao 5bc35d7cb6 Merge pull request 'feat-IRONFANS-70' (#344) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/344
 2024-04-25 18:45:09 +08:00
chenhao b75e80c928 Merge pull request 'by Robin at 20240425' (#343) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/343
 2024-04-25 18:44:57 +08:00
Leufolium 5fd92b9716 by Robin at 20240425 2024-04-25 18:44:35 +08:00
lwl0608 063e134f85 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 18:43:54 +08:00
lwl0608 6a6781e9d8 fix income stype 2024-04-25 18:43:38 +08:00
chenhao 0762fbac7d Merge pull request 'feat-IRONFANS-70' (#342) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/342
 2024-04-25 18:32:07 +08:00
chenhao b038ef5896 Merge pull request 'by Robin at 20240425' (#341) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/341
 2024-04-25 18:31:52 +08:00
Leufolium 4ffcf0a6a6 by Robin at 20240425 2024-04-25 18:31:34 +08:00
chenhao 68b723302a Merge pull request 'feat-IRONFANS-70' (#340) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/340
 2024-04-25 18:27:18 +08:00
chenhao cd7eb88088 Merge pull request 'by Robin at 20240425' (#339) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/339
 2024-04-25 18:27:08 +08:00
Leufolium 50599bbe49 by Robin at 20240425 2024-04-25 18:25:52 +08:00
chenhao 9f49851303 Merge pull request 'feat-IRONFANS-70' (#338) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/338
 2024-04-25 18:11:48 +08:00
chenhao 1692ee7360 Merge pull request 'by Robin at 20240425' (#337) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/337
 2024-04-25 18:11:37 +08:00
Leufolium a83558e581 by Robin at 20240425 2024-04-25 18:11:16 +08:00
chenhao de3a28ef12 Merge pull request 'feat-IRONFANS-70' (#336) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/336
 2024-04-25 17:53:47 +08:00
chenhao f7ae3aa297 Merge pull request 'by Robin at 20240425' (#335) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/335
 2024-04-25 17:53:35 +08:00
Leufolium 7a9f955262 by Robin at 20240425 2024-04-25 17:53:14 +08:00
lwl0608 77659e7a42 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 17:49:01 +08:00
lwl0608 6dca251071 fix income stype 2024-04-25 17:48:52 +08:00
chenhao ed836112fd Merge pull request 'feat-IRONFANS-70' (#334) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/334
 2024-04-25 17:21:15 +08:00
chenhao 2890f1e498 Merge pull request 'by Robin at 20240425' (#333) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/333
 2024-04-25 17:21:01 +08:00
Leufolium 8f574d73fb by Robin at 20240425 2024-04-25 17:20:35 +08:00
lwl0608 eb91dd804b Merge branch 'feat-IRONFANS-70' into test 2024-04-25 16:45:03 +08:00
lwl0608 88b4c917c6 fix calc 2024-04-25 16:44:50 +08:00
chenhao bf783ceb8b Merge pull request 'feat-IRONFANS-70' (#332) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/332
 2024-04-25 16:41:12 +08:00
chenhao 0d6b0bce10 Merge pull request 'by Robin at 20240425' (#331) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/331
 2024-04-25 16:41:01 +08:00
Leufolium 197fb8e87e by Robin at 20240425 2024-04-25 16:40:21 +08:00
lwl0608 85d20b02a9 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:28:32 +08:00
lwl0608 7e5c721c97 fix 2024-04-25 15:28:25 +08:00
lwl0608 ff3e66eca6 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:17:30 +08:00
lwl0608 8950b008e6 add log 2024-04-25 15:16:59 +08:00
lwl0608 4439f43169 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 15:12:35 +08:00
lwl0608 01e4bfcd8c fix refund_status 2024-04-25 15:12:22 +08:00
lwl0608 0f75a2f27e Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:41:46 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 67c1a7ef0e Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:37:12 +08:00
lwl0608 4fb56ba1cc add 2024-04-25 14:36:53 +08:00
lwl0608 6b3b18f31a Merge branch 'feat-IRONFANS-70' into test 2024-04-25 14:07:56 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +08:00
lwl0608 a41f626be5 Merge branch 'feat-IRONFANS-70' into test 2024-04-25 10:06:42 +08:00
lwl0608 25410368f5 order 2024-04-25 10:06:28 +08:00
chenhao fe866863e6 Merge pull request 'feat-IRONFANS-70' (#330) from feat-IRONFANS-70 into test 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/330
 2024-04-25 10:02:45 +08:00
chenhao b74f7540b8 Merge pull request 'by Robin at 20240425' (#329) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/329
 2024-04-25 10:02:33 +08:00
Leufolium 3fef23d3c3 by Robin at 20240425 2024-04-25 10:01:34 +08:00
lwl0608 8323f3917a Merge branch 'feat-IRONFANS-70' into test 2024-04-24 22:35:17 +08:00
lwl0608 cd840f36e4 refund 2024-04-24 22:35:00 +08:00
lwl0608 fa07d9ec5e Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:42:38 +08:00
lwl0608 49c31aa9ce fix 2024-04-24 21:42:31 +08:00
lwl0608 4862d2d7a1 Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:39:54 +08:00
lwl0608 c355c74390 fix 2024-04-24 21:39:47 +08:00
lwl0608 87fe741ebc Merge branch 'feat-IRONFANS-70' into test 2024-04-24 21:20:44 +08:00
lwl0608 4da4ca70d1 get zone by mid 2024-04-24 21:20:31 +08:00