wishpal_ironfan
/
service
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,220 Commits 73 Branches 0 Tags 30 MiB
Commit Graph

864 Commits

Author SHA1 Message Date
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
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
lwl0608 6a1db908d2 fix 2024-05-17 14:08:15 +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 a05451e99a 取消提现限制 2024-05-16 16:49:20 +08:00
Leufolium 0c3bb46562 by Robin at 20240516 2024-05-16 16:00:20 +08:00
Leufolium 3a3c50f851 by Robin at 20240516 2024-05-16 14:40:22 +08:00
lwl0608 8ba9674a27 fix data 2024-05-15 20:01:40 +08:00
lwl0608 ce579b9701 add log 2024-05-15 19:57:52 +08:00
lwl0608 9b8b37d5e1 fix 2024-05-15 19:12:22 +08:00
Leufolium c0698c2da3 Merge remote-tracking branch 'origin/main' into feat-IRONFANS-120-Robin 2024-05-15 16:30:50 +08:00
Leufolium 5016e7b7be by Robin at 20240515 2024-05-15 16:07:33 +08:00
lwl0608 534fe16e05 fix 2024-05-15 14:21:01 +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 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
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
Leufolium 7ab0b8ae82 by Robin at 20240514 2024-05-14 22:43:52 +08:00
Leufolium 4077eb2380 by Robin at 20240514 2024-05-14 22:31:33 +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 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
Leufolium 3dc9ca1665 by Robin at 20240514 2024-05-14 17:22:40 +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 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 22b28535a8 w 2024-05-11 00:04:06 +08:00
lwl0608 95ef64760d isWithdrawAnyDiasEnable 2024-05-10 23:51:35 +08:00
Leufolium 77efdcc607 by Robin at 20240510 2024-05-10 22:35:27 +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 6a7ff7a8ff add withdraw 2024-05-10 10:17:07 +08:00
lwl0608 f11e7e15ae fix price 2024-05-09 20:30:20 +08:00
lwl0608 ef3a1dde14 fix price 2024-05-09 19:53:19 +08:00
Leufolium 06227bd983 by Robin at 20240509 2024-05-09 18:07:05 +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
Leufolium ed70c08149 by Robin at 20240509 2024-05-09 00:02:16 +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
Leufolium 1a26469760 by Robin at 20240508 2024-05-08 20:49:11 +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 e7bd360f91 update 2024-05-08 09:53:04 +08:00
lwl0608 028a5232cd wechat 2024-05-08 09:53:04 +08:00
Leufolium 504b5135d7 by Robin at 20240507 2024-05-07 22:43:10 +08:00
Leufolium 7b385f395d by Robin at 20240507; set is_hided for zone third partner 2024-05-07 16:59:10 +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 b196114623 add withdraw freeze 2024-05-06 23:28:22 +08:00
lwl0608 ef88ac4d14 fix painc 2024-05-06 20:25:49 +08:00
lwl0608 2a5192c4e1 fix vip config 2024-05-06 20:17:52 +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 5ef25b96f4 fix zone VIP 2024-05-06 18:02:06 +08:00
lwl0608 4bc9900fbd fix zone VIP 2024-05-06 17:56:39 +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 affc815e8e fix is_moment_image_encrypt_enabled 2024-05-03 19:39:29 +08:00
lwl0608 bb90fafef6 req.WechatCoinPrice 兜底 2024-05-03 02:56:32 +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
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
Leufolium d8527b01b1 BY 2024-05-01 04:09:27 +08:00
Leufolium 138a8da41d by RObin at 2024-05-01 04:01:58 +08:00
Leufolium 74e6f9a9f5 by Robin at 20240501 2024-05-01 03:52:59 +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 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
Leufolium 7f18d00df4 by Robin at 20240430 2024-04-30 09:22:18 +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
Leufolium bd0fb55e8e by Robin at 20240429 2024-04-29 22:31:27 +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 924656e8ed contact 2024-04-29 17:52:52 +08:00
lwl0608 715ff91c51 zone_refund_list 2024-04-29 17:39:49 +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 cc7a910b72 fix zone ferund 2024-04-29 16:08:51 +08:00
lwl0608 a8d3a45b71 rollback ironfanship 2024-04-29 15:56:42 +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
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
Leufolium 442b84a0cd by Robin at 20240428 2024-04-28 21:26:59 +08:00
lwl0608 8db2ce1071 fix 2024-04-28 17:59:57 +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
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
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
Leufolium 2f4a80d3fc by Robin at 20240427 2024-04-27 00:47:18 +08:00
Leufolium 9a5968f158 by Robin at 20240427 2024-04-27 00:39:28 +08:00
Leufolium 9fed951998 by Robin at 20240427 2024-04-27 00:27:53 +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
Leufolium 2ac68c47c7 by Robin at 20240426 2024-04-26 14:54:27 +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 b47afa4909 fix 2024-04-25 19:19:22 +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 6a6781e9d8 fix income stype 2024-04-25 18:43:38 +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 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 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 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 6dca251071 fix income stype 2024-04-25 17:48:52 +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 88b4c917c6 fix calc 2024-04-25 16:44:50 +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 7e5c721c97 fix 2024-04-25 15:28:25 +08:00
lwl0608 8950b008e6 add log 2024-04-25 15:16:59 +08:00
lwl0608 01e4bfcd8c fix refund_status 2024-04-25 15:12:22 +08:00
lwl0608 a64b404298 fix 2024-04-25 14:41:36 +08:00
lwl0608 4fb56ba1cc add 2024-04-25 14:36:53 +08:00
lwl0608 f3533490f8 add 2024-04-25 14:07:46 +08:00
lwl0608 25410368f5 order 2024-04-25 10:06:28 +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 cd840f36e4 refund 2024-04-24 22:35:00 +08:00
lwl0608 49c31aa9ce fix 2024-04-24 21:42:31 +08:00
lwl0608 c355c74390 fix 2024-04-24 21:39:47 +08:00
lwl0608 4da4ca70d1 get zone by mid 2024-04-24 21:20:31 +08:00
chenhao 2a84d99b65 Merge pull request 'by Robin at 20240424' (#327) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/327
 2024-04-24 20:17:18 +08:00
Leufolium 5d7220246e by Robin at 20240424 2024-04-24 20:16:22 +08:00
lwl0608 f4dd7158e1 add incomlist log 2024-04-24 19:36:01 +08:00
lwl0608 6e83930c9e fix 2024-04-23 19:08:45 +08:00
chenhao d48d695310 Merge pull request 'by Robin at 20240422' (#325) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/325
 2024-04-23 18:32:13 +08:00
Leufolium 1966a42d28 by Robin at 20240422 2024-04-23 18:30:28 +08:00
lwl0608 58c2692eb8 fix coin order 2024-04-23 17:39:42 +08:00
lwl0608 2860992cba fix in error 2024-04-23 17:32:29 +08:00
lwl0608 561afa8755 fix tx 2024-04-23 17:29:27 +08:00
lwl0608 9cd894a47b fix chaofen song weixin 2024-04-23 17:22:47 +08:00
lwl0608 f901feadf7 fix chaofen song weixin 2024-04-23 17:12:41 +08:00
lwl0608 8e52f92b0b add 2024-04-23 17:01:59 +08:00
lwl0608 9600ec1b29 fix 2024-04-22 22:09:22 +08:00
lwl0608 ca924bf81a fix 2024-04-22 21:20:17 +08:00
Leufolium 0eef3c0aef by Robin at 20240422 2024-04-22 20:19:17 +08:00
chenhao 484a4a5fa1 Merge pull request 'by Robin at 20240422' (#319) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/319
 2024-04-22 19:36:53 +08:00
Leufolium 475132987d by Robin at 20240422 2024-04-22 19:36:30 +08:00
chenhao 7067c143de Merge pull request 'by Robin at 20240422' (#318) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/318
 2024-04-22 19:21:32 +08:00
Leufolium 312c078216 by Robin at 20240422 2024-04-22 19:21:14 +08:00
chenhao 71ccf53d70 Merge pull request 'by Robin at 20240422' (#316) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/316
 2024-04-22 18:57:12 +08:00
Leufolium 50fa5e32b7 by Robin at 20240422 2024-04-22 18:56:53 +08:00
chenhao d074023584 Merge pull request 'by Robin at 20240422' (#314) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/314
 2024-04-22 18:34:06 +08:00
Leufolium bf1de24bcd by Robin at 20240422 2024-04-22 18:33:40 +08:00
chenhao 796e09af2f Merge pull request 'by Robin at 20240422' (#312) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/312
 2024-04-22 18:20:36 +08:00
Leufolium ab8db00368 by Robin at 20240422 2024-04-22 18:19:37 +08:00
chenhao 78b363183b Merge pull request 'by Robin at 20240422' (#308) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/308
 2024-04-22 07:18:38 +08:00
Leufolium f2c9c5a7f6 by Robin at 20240422 2024-04-22 07:18:23 +08:00
chenhao a5837da513 Merge pull request 'by Robin at 20240422' (#306) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/306
 2024-04-22 07:16:39 +08:00
Leufolium f0074facd9 by Robin at 20240422 2024-04-22 07:15:46 +08:00
lwl0608 cd62e4b4c7 fix zid 2024-04-19 23:59:31 +08:00
lwl0608 8a4693e7fe fix zid 2024-04-19 23:58:42 +08:00
lwl0608 fcb867cc88 add moment 2024-04-19 23:54:56 +08:00
lwl0608 806c223a8b fix 2024-04-19 23:41:18 +08:00
lwl0608 8fca291eb0 fix 2024-04-19 23:33:00 +08:00
lwl0608 23b4d166ec 增加逻辑 2024-04-19 10:11:14 +08:00
lwl0608 780fb7ab32 fix 2024-04-18 22:59:56 +08:00
lwl0608 b2c89fb357 fix 2024-04-18 22:59:32 +08:00
lwl0608 b4d52e3a2c fix 2024-04-18 22:53:25 +08:00
lwl0608 43aa1516be 优化 2024-04-18 21:17:41 +08:00
lwl0608 82b927807a 优化 2024-04-18 20:31:43 +08:00
lwl0608 e7ba504413 优化 2024-04-18 20:27:18 +08:00
lwl0608 d6217c6f39 vas 2024-04-18 19:26:52 +08:00
chenhao 953fb01d89 Merge pull request 'by Robin at 20240418' (#304) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/304
 2024-04-18 17:43:32 +08:00
Leufolium 460153a394 by Robin at 20240418 2024-04-18 17:43:12 +08:00
chenhao 4a4005da91 Merge pull request 'by Robin at 20240418' (#302) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/302
 2024-04-18 17:18:34 +08:00
Leufolium a1093d383e by Robin at 20240418 2024-04-18 17:17:58 +08:00
chenhao 9436053275 Merge pull request 'by Robin at 20240418' (#300) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/300
 2024-04-18 05:59:58 +08:00
Leufolium 4fc3732b94 by Robin at 20240418 2024-04-18 05:59:11 +08:00
chenhao 4911ff6add Merge pull request 'by Robin at 20240417' (#298) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/298
 2024-04-17 23:40:11 +08:00
Leufolium 13fb262b82 by Robin at 20240417 2024-04-17 23:39:37 +08:00
lwl0608 f5e7265d23 fix checkwlt 2024-04-16 22:14:40 +08:00
lwl0608 d731659a50 fix 2024-04-16 22:09:15 +08:00
lwl0608 89bc85b415 fix 2024-04-16 21:57:34 +08:00
lwl0608 e03489feba fix 2024-04-16 21:54:31 +08:00
lwl0608 c3247fcf66 fix checkwallet 2024-04-16 21:49:18 +08:00
lwl0608 03fdc98f3d 修复 2024-04-16 21:13:26 +08:00
lwl0608 5dedd4fd27 fix db 2024-04-16 20:20:53 +08:00
chenhao 559f6c1aff Merge pull request 'by Robin at 20240416' (#296) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/296
 2024-04-16 19:48:29 +08:00
Leufolium 50ef95271c by Robin at 20240416 2024-04-16 19:48:15 +08:00
lwl0608 2177fdadbb zv fix 2024-04-16 19:39:51 +08:00
lwl0608 a3555962d8 fix 2024-04-16 19:19:06 +08:00
Leufolium 7b24d98dd5 By Robin at 20240416 2024-04-16 19:01:33 +08:00
Leufolium 4fe9faa1bb by Robin at 20240416 2024-04-16 18:59:32 +08:00
lwl0608 9fdbd5bcb2 add 2024-04-16 10:49:02 +08:00
lwl0608 5c01857d28 add 2024-04-16 09:51:39 +08:00
Leufolium da6d60020c by Robin at 20240416 2024-04-16 07:41:52 +08:00
lwl0608 eb3d14199e vas 2024-04-15 15:17:30 +08:00
chenhao c1a2237479 Merge pull request 'dev-feat-IRONFANS-70-Robin' (#286) from dev-feat-IRONFANS-70-Robin into feat-IRONFANS-70 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/286
 2024-04-12 23:07:12 +08:00
Leufolium 0afe2c2193 by Robin at 20240412 2024-04-12 23:05:46 +08:00
Leufolium e986f9ba07 by Robin at 20240412 2024-04-12 23:02:55 +08:00
lwl0608 91a3bd5371 add 2024-04-12 10:01:56 +08:00
Leufolium c7d931b10e by Robin at 20240411 2024-04-12 06:40:43 +08:00
Leufolium 52624ac592 by Robin at 20240411 2024-04-12 06:40:30 +08:00
Leufolium 8faf3cfefe by Robin at 20240411 2024-04-11 22:19:28 +08:00
Leufolium b4e04b8841 by Robin at 20240411 2024-04-11 21:51:46 +08:00
Leufolium 99116d4f31 by Robin at 20240411 2024-04-11 20:58:26 +08:00
Leufolium 159b16a8a7 by Robin at 20240411 2024-04-11 20:17:55 +08:00
Leufolium 6c47d7fa33 by Robin at 20240411 2024-04-11 19:37:04 +08:00
Leufolium c89082aea9 by Robin at 20240411 2024-04-11 19:34:51 +08:00
Leufolium acfe24623f by Robin at 20240411 2024-04-11 18:33:38 +08:00
Leufolium 50945229e6 by Robin at 20240411 2024-04-11 18:17:32 +08:00
Leufolium 31903d0ed0 by Robin at 20240411 2024-04-11 17:58:33 +08:00
Leufolium 0dd9eb1360 by Robin at 20240411 2024-04-11 16:52:30 +08:00
Leufolium 1c5a9bbdc5 by Robin at 20240411 2024-04-11 16:08:05 +08:00
Leufolium b7e5eda22d by Robin at 20240411 2024-04-11 15:55:14 +08:00
Leufolium 0975288b86 by Robin at 20240411 2024-04-11 15:46:01 +08:00
Leufolium 9e1ec21e31 b 2024-04-11 14:40:18 +08:00
Leufolium cc882c203d by Robin at 20240411 2024-04-11 14:37:45 +08:00
Leufolium 5b292b346a by Robin at 20240411 2024-04-11 14:03:40 +08:00
Leufolium ab65df6d06 by Robin at 20240411 2024-04-11 14:01:26 +08:00
Leufolium da1aa0ebd7 by Robin at 20240411 2024-04-11 00:25:06 +08:00
Leufolium 67949942be by Robin at 20240409 2024-04-09 22:37:12 +08:00
Leufolium f96a04614a by Robin at 20240409 2024-04-09 19:19:16 +08:00
Leufolium 8927d22bba by Robin at 20240408 2024-04-08 20:05:13 +08:00
Leufolium 3b56c2df7c by Robin at 20240405; 2024-04-05 19:23:36 +08:00
Leufolium 4bb95ee7c6 by Robin at 20240404 2024-04-04 21:22:19 +08:00
Leufolium 273f7a858c by Robin at 20240404 2024-04-04 21:17:05 +08:00
Leufolium 2400311048 by Robin at 20240404 2024-04-04 21:03:32 +08:00
Leufolium 4820bd9503 by Robin at 20240404 2024-04-04 20:48:42 +08:00
Leufolium 77b664bbea by Robin at 20240403 2024-04-03 21:53:46 +08:00
Leufolium 44d9325e54 by Robin at 20240403; 2024-04-03 06:34:28 +08:00
Leufolium 1650066959 by Robin at 20240403 2024-04-03 06:28:55 +08:00
Leufolium 6a043dbbb7 by Robin at 20240403 2024-04-03 06:19:11 +08:00
Leufolium ed5d905eb7 by Robin at 20240403 2024-04-03 06:04:50 +08:00
Leufolium 50f7e16608 by Robin at 20240403 2024-04-03 04:56:21 +08:00
Leufolium ea6eea1ccf by Robin at 20240403 2024-04-03 00:25:14 +08:00
Leufolium 15bb43afdf by Robin at 20240402 2024-04-02 22:47:41 +08:00
Leufolium a31e57c806 by Robin at 20240402 2024-04-02 18:53:26 +08:00
Leufolium a69bcdb6a2 Merge branch 'feat-IRONFANS-70' into dev-feat-IRONFANS-70-Robin 2024-04-01 11:19:10 +08:00
Leufolium dc65d4f32e Merge remote-tracking branch 'origin/main' into feat-IRONFANS-70 2024-04-01 11:18:03 +08:00
chenhao 77a336bfa8 Merge pull request 'feat-IRONFANS-76-Robin' (#222) from feat-IRONFANS-76-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/222
 2024-03-29 23:19:33 +08:00
Leufolium cd7a9275aa by Robin at 20240329 2024-03-29 23:07:36 +08:00
Leufolium 8cc83fc70c by Robin at 20240329 2024-03-29 22:55:58 +08:00
Leufolium f08bd346c9 by Robin at 20240329 2024-03-29 14:03:59 +08:00
Leufolium 12549d2de5 by Robin at 20240329; alter moment audit procedure 2024-03-29 00:16:42 +08:00
chenhao 114939f340 Merge pull request 'by Robin at 20240328' (#217) from feat-IRONFANS-ALTER-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/217
 2024-03-28 13:00:25 +08:00
Leufolium df9defb44f by Robin at 20240328 2024-03-28 13:00:07 +08:00
Leufolium 1bd0784227 by Robin at 20240327; 2024-03-27 20:50:40 +08:00
Leufolium fd1706dd51 by Robin at 20240327; op list deleted 2024-03-27 20:29:22 +08:00
Leufolium 3cc6f0a322 by Robin at 20240327; alter down 2024-03-27 15:45:01 +08:00
Leufolium 8dcd0562e4 by Robin at 20240326; alter streamer recomm 2024-03-26 18:11:38 +08:00
Leufolium dc3432ee72 by 2024-03-26 13:17:10 +08:00
Leufolium ed6b2e356b by Robin at 20240326 2024-03-26 13:12:15 +08:00
Leufolium 594987f8ac by Robin at 20240326; alter 2024-03-26 12:29:53 +08:00
chenhao bf2605738c Merge pull request 'by Robin at 20240325; fix bug' (#200) from BUG-20240322-0001-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/200
 2024-03-25 12:27:53 +08:00
Leufolium 7df6e1862c by Robin at 20240325; fix bug 2024-03-25 12:27:37 +08:00
Leufolium 1ab2b556a1 Merge branch 'BUG-20240322-0001-Robin' into mainconflict 2024-03-25 12:13:49 +08:00
Leufolium 294bea59e4 By Robin at 20240325; fix bug 2024-03-25 12:11:29 +08:00
chenhao a934f070d7 Merge pull request 'by Robin at 20240322; -fans' (#196) from feat-IRONFANS-58-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/196
 2024-03-22 14:08:44 +08:00
Leufolium dacc31cb31 by Robin at 20240322; -fans 2024-03-22 14:08:30 +08:00
Leufolium 5344a54888 Merge remote-tracking branch 'origin/feat-IRONFANS-58-Robin' into mainconflict 2024-03-22 13:54:11 +08:00
Leufolium 407292fe8d by Robin at 20240321 2024-03-21 23:26:23 +08:00
lwl0608 bbcfcb3b95 fix recover 2024-03-21 20:31:12 +08:00
lwl0608 53086cde6c fix recover 2024-03-21 20:27:42 +08:00
lwl0608 ad95c1be67 recover 2024-03-21 20:18:22 +08:00
lwl0608 6f16b754ce fix panic 2024-03-21 20:10:30 +08:00
lwl0608 59d9638bef fix 2024-03-21 20:06:27 +08:00
lwl0608 1cd3e685e3 fix 退款理由 2024-03-21 20:03:31 +08:00
lwl0608 1255e0f916 fix 退款理由 2024-03-21 19:54:20 +08:00
lwl0608 f1728bb5a3 fix err return 2024-03-21 19:25:54 +08:00
lwl0608 27e50ded04 fix err return 2024-03-21 19:18:50 +08:00
lwl0608 66f90c6b45 op order list 2024-03-21 16:05:11 +08:00
lwl0608 6d73c70cf7 op order list 2024-03-21 16:02:41 +08:00
lwl0608 b263f04fd1 fix 2024-03-20 18:57:05 +08:00
lwl0608 2511bf9e1f 优化 2024-03-20 18:51:16 +08:00
Leufolium a364553c0c by Robin at 20240320 2024-03-20 10:06:26 +08:00
lwl0608 acd49e99a2 fix 2024-03-19 17:41:51 +08:00
lwl0608 9bd1c77f4a fix 2024-03-19 16:34:02 +08:00
lwl0608 31a7247337 优化 2024-03-19 16:21:53 +08:00
lwl0608 d2e0a24bb3 fix productid 2024-03-19 16:09:51 +08:00
lwl0608 fca64cbb67 refund coin order 2024-03-19 16:04:36 +08:00
lwl0608 05fbd7e04e 充值明细 优化 2024-03-19 10:30:25 +08:00
lwl0608 184a3ff5e2 明细 时间倒序 2024-03-19 10:20:50 +08:00
Leufolium 37c3929e9d Merge remote-tracking branch 'origin/feat-IRONFANS-62-Robin' into mainconflict 2024-03-19 00:01:43 +08:00
chenhao 6bda0929d9 Merge pull request 'feat-IRONFANS-66-Robin' (#189) from feat-IRONFANS-66-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/189
 2024-03-18 23:51:52 +08:00
Leufolium d2f961a2d4 1 2024-03-18 23:51:31 +08:00
Leufolium 5ca57d639f ret 2024-03-17 00:32:47 +08:00
Leufolium 8c82c59384 1 2024-03-17 00:31:02 +08:00
Leufolium f2c294b379 1 2024-03-17 00:25:37 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
Leufolium 5ccad2cbca by Robin at 20240315 2024-03-15 21:18:11 +08:00
Leufolium a10ce673ec by Robin at 20240315; alter upper bound 2024-03-15 21:13:57 +08:00
Leufolium b8dc1a7a1b Merge remote-tracking branch 'origin/testonly-vericode_create' into mainconflict 2024-03-15 00:45:38 +08:00
Leufolium a2f70a63d9 by Robin at 20240314; add newly-created moment 2024-03-14 07:53:25 +08:00
lwl0608 7b4954bbf8 fix streamer id 2024-03-13 21:06:00 +08:00
lwl0608 371cf04c5f ch log 2024-03-13 20:51:29 +08:00
lwl0608 9e1a95bfe3 refund 2024-03-13 20:38:03 +08:00
lwl0608 779e47996e Merge branch 'dev-lwl/refund' 2024-03-13 20:35:32 +08:00
lwl0608 b833ecdc9e refund 2024-03-13 20:35:18 +08:00
Leufolium 3d0dbb6ca2 by Robin at 20240313; alter msg for permanent block 2024-03-13 16:31:51 +08:00
chenhao 5881859273 Merge pull request 'by Robin at 20240222; fix' (#174) from feat-IRONFANS-54-Robin into main 
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/174
 2024-03-12 23:49:14 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
Leufolium d93e59e24f by Robin at 20240308; moment list by ids add follow 2024-03-08 23:03:20 +08:00
Leufolium 7497d4afe5 by Robin at 20240308; remove log 2024-03-08 22:46:49 +08:00
Leufolium db9d6b2b0b by Robin at 20240308 2024-03-08 22:36:16 +08:00
Leufolium 43138ec16d by Robin at 20240308; moment recomm 2024-03-08 21:14:40 +08:00
Leufolium 30bcd59226 by Robin at 20240308，up op refreshes bottom flag 2024-03-08 15:43:15 +08:00
Leufolium 5f253ab9d3 fix 2024-03-08 15:22:33 +08:00
Leufolium 81d0858aad by 2024-03-08 15:21:52 +08:00
Leufolium bed1313e84 by Robin at 20240308; add bottom flag 2024-03-08 15:15:09 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00