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

2745 Commits

Author SHA1 Message Date
chenhao 8c24850420 Merge pull request 'feat-IRONFANS-212-Robin' (#929) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/929
 2024-12-25 13:02:55 +08:00
Robin 0c0ffdceb1 1 2024-12-25 13:02:24 +08:00
Robin 73d3b45ac9 by Robin at 20241225 2024-12-25 13:01:23 +08:00
Robin 5db69591df by Robin at 20241225 2024-12-25 13:00:38 +08:00
wangxinyu e30115e539 Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-25 12:31:36 +08:00
wangxinyu 0b927164c1 fix: 退款 2024-12-25 12:31:05 +08:00
wangxinyu 6cd2f0801f Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-25 12:14:12 +08:00
wangxinyu 14a6025610 fix: 主播审核退款 2024-12-25 12:13:08 +08:00
wangxinyu c887e7bbc6 Merge remote-tracking branch 'origin/feature-streamer_nick_audit-wxy-20241209' into test 2024-12-25 10:44:34 +08:00
wangxinyu c5a9102063 fix:op主播昵称审核 2024-12-25 10:41:45 +08:00
lwl0608 441072b03a Merge branch 'dev-lwl/add_poseidon' into test 2024-12-24 17:53:23 +08:00
lwl0608 ff299d6063 auth token 2024-12-24 17:36:48 +08:00
chenhao a08f7d6d6d Merge pull request 'by Robin at 20241224' (#928) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/928
 2024-12-24 17:29:21 +08:00
Robin 615d0d7024 by Robin at 20241224 2024-12-24 17:27:21 +08:00
wangxinyu 258a274bd3 Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-24 17:06:11 +08:00
wangxinyu 3cb36bdf6d fix:分页 2024-12-24 17:05:40 +08:00
chenhao c9bd567875 Merge pull request 'by Robin at 20241224' (#927) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/927
 2024-12-24 16:51:12 +08:00
Robin 3841573b72 by Robin at 20241224 2024-12-24 16:49:55 +08:00
wangxinyu 48a49808e7 Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-24 16:41:47 +08:00
wangxinyu 105f77e9e8 fix:退款订单已经超时 2024-12-24 16:41:09 +08:00
chenhao a1259fb0fa Merge pull request 'by Robin at 20241224' (#926) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/926
 2024-12-24 16:31:50 +08:00
Robin e45cef8428 by Robin at 20241224 2024-12-24 16:28:27 +08:00
wangxinyu d4cc723c34 Merge remote-tracking branch 'origin/feature-streamer_nick_audit-wxy-20241209' into test 2024-12-24 15:39:29 +08:00
wangxinyu 47fbda1240 feat:主播修改昵称审核-op 列表 2024-12-24 15:37:23 +08:00
chenhao 2648cc5cfe Merge pull request 'by Robin at 20241224' (#925) from feat-IRONFANS-212-Robin into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/925
 2024-12-24 15:22:37 +08:00
Robin 66f6ea1676 by Robin at 20241224 2024-12-24 15:21:57 +08:00
Robin a570e5367a 1 2024-12-24 15:09:30 +08:00
Robin 2ca3ccc915 1 2024-12-24 15:06:52 +08:00
chenhao 5c4161d88a Merge pull request 'conf-212' (#924) from conf-212 into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/924
 2024-12-24 14:49:14 +08:00
Robin 12736a910f Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-24 14:48:44 +08:00
Robin 057badc5c1 by Robin at 20241224 2024-12-24 14:46:49 +08:00
wangxinyu 0c3108040e Merge remote-tracking branch 'origin/feature-pay_picture-wxy-20241216' into test 2024-12-24 11:45:11 +08:00
wangxinyu ec7b7adf61 fix: 会员看原图，图片格式判断 2024-12-24 11:44:24 +08:00
wangxinyu 3fc0a1c77f fix: 退款周期任务 2024-12-24 11:18:34 +08:00
wangxinyu b89fd9638b fix: 图片链接修改 2024-12-23 17:18:21 +08:00
wangxinyu 16d4cd46a5 Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-23 16:58:38 +08:00
wangxinyu b7052cf399 fix: 退款-主播 id 修改 2024-12-23 16:58:05 +08:00
chenhao 37c50094c5 Merge pull request 'conf-212' (#921) from conf-212 into test 
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/921
 2024-12-23 16:43:22 +08:00
Robin 5c0228b186 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-23 16:42:51 +08:00
Robin 7d6c85ad92 by Robin at 20241223 2024-12-23 16:40:11 +08:00
lwl0608 51d818b10b Merge branch 'dev-lwl/add_poseidon' into test 2024-12-23 15:44:11 +08:00
lwl0608 3a9548ffc7 fix mod 2024-12-23 15:44:06 +08:00
lwl0608 151f0b8be0 Merge branch 'dev-lwl/add_poseidon' into test 2024-12-23 15:41:29 +08:00
lwl0608 caceb4d71f vendor 2024-12-23 15:41:22 +08:00
lwl0608 771d69b9c4 vendor 2024-12-23 15:40:29 +08:00
lwl0608 6ac18ae13c merge 2024-12-23 15:34:34 +08:00
lwl0608 666d1e88e8 test actionlog 2024-12-23 15:33:00 +08:00
lwl0608 a1cd949949 Merge branch 'dev-lwl/firenze' 2024-12-23 15:11:56 +08:00
lwl0608 c1de47efb4 Merge branch 'dev-lwl/firenze' into test 2024-12-23 15:11:39 +08:00
lwl0608 f7fd3db001 firenze stdout disable 2024-12-23 15:10:49 +08:00