Commit Graph

831 Commits

Author SHA1 Message Date
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 0dba8132b0 Merge pull request '1' (#190) from feat-IRONFANS-66-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/190
2024-03-18 23:52:22 +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
chenhao 6518d37c1f Merge pull request 'feat-IRONFANS-66-Robin' (#188) from feat-IRONFANS-66-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/188
2024-03-18 23:43:13 +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
chenhao f791ed8971 Merge pull request 'conflict' (#183) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/183
2024-03-16 22:36:49 +08:00
Leufolium 67e27e04db Merge branch 'BUG-20240316-0001-Robin' into conflict 2024-03-16 22:36:05 +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 3bd1639124 Merge pull request 'by Robin at 20240315' (#181) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/181
2024-03-15 21:18:40 +08:00
Leufolium 5ccad2cbca by Robin at 20240315 2024-03-15 21:18:11 +08:00
chenhao cf34472eb5 Merge pull request 'by Robin at 20240315; alter upper bound' (#180) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/180
2024-03-15 21:14:51 +08:00
Leufolium a10ce673ec by Robin at 20240315; alter upper bound 2024-03-15 21:13:57 +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
chenhao 2783a4f25a Merge pull request 'conflict' (#177) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/177
2024-03-14 07:56:36 +08:00
Leufolium 1954e80ab3 Merge branch 'feat-IRONFANS-58-Robin' into conflict 2024-03-14 07:55:43 +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
chenhao 4711e9e2e4 Merge pull request 'by Robin at 20240313; alter msg for permanent block' (#175) from feat-IRONFANS-66-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/175
2024-03-13 16:32:42 +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
lwl0608 f781786e13 fix cdn 2024-03-12 21:21:46 +08:00
chenhao b49ed96c2a Merge pull request 'conflict' (#173) from conflict into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/173
2024-03-12 12:13:47 +08:00
Leufolium f990dd0be0 Merge branch 'feat-IRONFANS-66-Robin' into conflict 2024-03-12 12:10:16 +08:00
Leufolium 81916b58bb by Robin at 20240312; apply 2024-03-12 12:06:45 +08:00
chenhao 0c3499f6a9 Merge pull request 'feat-IRONFANS-58-Robin' (#171) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/171
2024-03-08 23:03:50 +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
chenhao 758dc0ef66 Merge pull request 'by Robin at 20240308' (#170) from feat-IRONFANS-58-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/170
2024-03-08 22:37:15 +08:00
Leufolium db9d6b2b0b by Robin at 20240308 2024-03-08 22:36:16 +08:00