Commit Graph

335 Commits

Author SHA1 Message Date
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
chenhao d92fe95c31 Merge pull request '1' (#193) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/193
2024-03-19 00:05:36 +08:00
Leufolium 3d09829521 1 2024-03-19 00:05:23 +08:00
chenhao ff6023a7f1 Merge pull request 'mainconflict' (#192) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/192
2024-03-19 00:02:17 +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 ec2bad2abf by 2024-03-18 23:36:53 +08:00
Leufolium 2b5396d96b by robin at 20240318; alter text for punishing 2024-03-18 23:34:49 +08:00
chenhao c7ced3c1a4 Merge pull request 'BUG-20240316-0001-Robin' (#187) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/187
2024-03-17 00:42:52 +08:00
Leufolium 776f52c177 加json字段 2024-03-17 00:42:26 +08:00
Leufolium 5ca57d639f ret 2024-03-17 00:32:47 +08:00
chenhao 0107f8f417 Merge pull request '1' (#186) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/186
2024-03-17 00:31:13 +08:00
Leufolium 8c82c59384 1 2024-03-17 00:31:02 +08:00
chenhao 7dab8f992c Merge pull request '1' (#185) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/185
2024-03-17 00:25:52 +08:00
Leufolium f2c294b379 1 2024-03-17 00:25:37 +08:00
chenhao 4abf690044 Merge pull request 'by Robin at 20240316; alter account search expr' (#184) from BUG-20240316-0001-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/184
2024-03-16 23:56:34 +08:00
Leufolium 89c8c5565b by Robin at 20240316; alter account search expr 2024-03-16 22:33:58 +08:00
lwl0608 e734e3b653 mongodb 迁移 2024-03-16 17:10:58 +08:00
chenhao a9231869d8 Merge pull request 'mainconflict' (#179) from mainconflict into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/179
2024-03-15 00:45:53 +08:00
Leufolium b8dc1a7a1b Merge remote-tracking branch 'origin/testonly-vericode_create' into mainconflict 2024-03-15 00:45:38 +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
lwl0608 19f60097ff cdn test 2024-03-08 15:49:57 +08:00
lwl0608 93048a1a4b cdn test 2024-03-08 15:49:32 +08:00
Leufolium f94f90b0e7 by Robin at 20240308; logout 2024-03-08 12:52:10 +08:00
lwl0608 3273330c76 refund 2024-03-07 19:39:33 +08:00
Leufolium a1a4820b2c by Robin at 20240307 alter streamer cancel text 2024-03-07 02:17:24 +08:00
Leufolium 279263fd54 d 2024-03-07 01:49:37 +08:00
Leufolium 8dfbc2326b by Robin at 20240307 2024-03-07 01:43:30 +08:00
Leufolium 51d3e5e568 By Robin at 20240307 2024-03-07 01:18:41 +08:00
Leufolium e5bc859d98 by Robin at 20240306; mix test sql conn info 2024-03-06 20:07:34 +08:00
chenhao e95ca7f4f1 revert 5fab9ff0fd
revert By Robin at 20240304; cancel account function at mongo part
2024-03-05 13:21:22 +08:00
Leufolium 5fab9ff0fd By Robin at 20240304; cancel account function at mongo part 2024-03-04 19:21:30 +08:00
chenhao fe3e1c35be Merge pull request 'by Robin at 20240302' (#156) from feat-IRONFANS-61-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/156
2024-03-02 08:29:46 +08:00
Leufolium b2b29d7466 by Robin at 20240302 2024-03-02 08:29:20 +08:00
chenhao a41a571e85 Merge pull request 'feat-IRONFANS-61-Robin' (#155) from feat-IRONFANS-61-Robin into main
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/155
2024-02-29 11:28:12 +08:00
Leufolium b41aad7e4e 1 2024-02-29 11:22:33 +08:00
Leufolium b728ab5e48 by Robin at 20240229; fix 2024-02-29 11:20:25 +08:00