Commit Graph

2527 Commits

Author SHA1 Message Date
chenhao e97e4b3e74 Merge pull request 'feat-IRONFANS-212-Robin' (#883) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/883
2024-12-11 18:23:53 +08:00
Robin 095d4ed5fb 1 2024-12-11 18:23:35 +08:00
wangxinyu 8df13426a6 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 18:23:03 +08:00
wangxinyu 83cd231f76 fix: 主播修改昵称审核 upsert 2024-12-11 18:22:19 +08:00
chenhao beccc8b22f Merge pull request 'main' (#881) from main into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/881
2024-12-11 18:21:17 +08:00
Robin 2a6107c1b9 by Robin at 20241211 2024-12-11 18:20:47 +08:00
Robin afd4108967 by Robin at 20241211 2024-12-11 18:16:16 +08:00
wangxinyu fdba3a67dc Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 18:00:12 +08:00
wangxinyu 523b277364 test: 测试日志增加 2024-12-11 17:59:40 +08:00
wangxinyu 3dc691906a Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-11 17:34:05 +08:00
wangxinyu 0628cc53d3 fix: 主播修改昵称 自测 数据写入失败修改 2024-12-11 17:33:40 +08:00
wangxinyu 33355be51a fix:合并 2024-12-11 16:54:28 +08:00
wangxinyu 550f72f71a Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test
# Conflicts:
#	dbstruct/account.go
2024-12-11 16:49:59 +08:00
wangxinyu 9c4394fb34 feat: 主播昵称过人审 2024-12-11 16:44:38 +08:00
Robin 7ffa6ba385 by Robin at 20241211 2024-12-11 15:01:24 +08:00
chenhao 13e9fc005d Merge pull request 'by Robin at 20241210' (#880) from BUG-20241210 into main
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/880
2024-12-10 23:37:01 +08:00
Leufolium 18b474ac5f by Robin at 20241210 2024-12-10 23:36:28 +08:00
lwl0608 72252084db Merge branch 'dev-lwl/config' into test 2024-12-10 17:11:43 +08:00
lwl0608 5fd6bec4bc add val 2024-12-10 17:11:09 +08:00
wangxinyu bbf48de065 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-10 17:05:38 +08:00
wangxinyu 38b6d24a55 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 16:01:21 +08:00
wangxinyu 1aec8d6534 fix: del todo1 2024-12-10 15:59:15 +08:00
wangxinyu 1fb5625ec0 feat: 主播修改微信昵称通过人审 2024-12-10 15:56:36 +08:00
chenhao 0645f170b4 Merge pull request 'by Robin at 20241210' (#879) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/879
2024-12-10 15:05:31 +08:00
Robin 4d92cc78ce by Robin at 20241210 2024-12-10 15:03:57 +08:00
chenhao 09d57f3600 Merge pull request 'by Robin at 20241210' (#878) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/878
2024-12-10 14:57:46 +08:00
Robin d74d36ed03 by Robin at 20241210 2024-12-10 14:56:33 +08:00
chenhao c6439c4d6c Merge pull request 'conf-250' (#877) from conf-250 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/877
2024-12-10 14:45:14 +08:00
Robin 1cee56614f Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-10 14:44:45 +08:00
Robin c589e06a7b by Robin at 20241210 2024-12-10 14:39:12 +08:00
lwl0608 f97f18ac49 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 14:08:30 +08:00
lwl0608 bacf62d5a9 send ding msg 2024-12-10 14:08:23 +08:00
lwl0608 e3cf856aa7 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 13:34:25 +08:00
lwl0608 e0d8575b78 no sync 2024-12-10 13:34:16 +08:00
wangxinyu eea6d0e028 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:46:49 +08:00
wangxinyu ac659dbc6c feat: 主播微信号不能设置[wxid]开头的初始微信 api接口 2024-12-10 11:46:24 +08:00
lwl0608 4804f72e41 test 2024-12-10 11:42:17 +08:00
lwl0608 666d2a6dfd test 2024-12-10 11:39:16 +08:00
lwl0608 592dfc7aa9 xxx 2024-12-10 11:30:33 +08:00
wangxinyu d479e16329 Merge branch 'feature-wxid_filtration-wxy-20241209' into test 2024-12-10 11:29:24 +08:00
wangxinyu 12b1052a9e Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 11:23:49 +08:00
wangxinyu 64977d4e2e fix: refundInfo参数 2024-12-10 11:23:22 +08:00
lwl0608 7990465239 f 2024-12-10 11:22:15 +08:00
lwl0608 6bb656ee34 test 2024-12-10 11:21:48 +08:00
lwl0608 02da0b206d Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-10 11:20:05 +08:00
lwl0608 ea5a11fa17 x 2024-12-10 11:19:42 +08:00
wangxinyu 91f5c64404 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-10 10:34:50 +08:00
wangxinyu 17902f8c2d fix: 退款详情页增加用户昵称 2024-12-10 10:34:17 +08:00
lwl0608 ce3dbbd907 Merge branch 'dev-lwl/withraw_sync_alipay' into test 2024-12-09 17:19:47 +08:00
lwl0608 95a927c26f fix 2024-12-09 17:19:39 +08:00