Commit Graph

256 Commits

Author SHA1 Message Date
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
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
chenhao 75cf70878a Merge pull request 'by Robin at 20241218' (#917) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/917
2024-12-18 15:56:11 +08:00
Robin a194bc0229 by Robin at 20241218 2024-12-18 15:55:11 +08:00
wangxinyu 7b47d92bf0 Merge remote-tracking branch 'origin/feature-pay_picture-wxy-20241216' into test
# Conflicts:
#	dbstruct/account.go
2024-12-18 13:35:22 +08:00
Robin f2e5cd443c Merge branch 'feat-IRONFANS-1000065-Robin' into conf-1000065 2024-12-17 16:20:37 +08:00
Robin 68e4be4fce by Robin at 20241217; 2024-12-17 16:17:03 +08:00
chenhao 9162ee4ab6 Merge pull request 'feat-IRONFANS-212-Robin' (#904) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/904
2024-12-16 14:29:18 +08:00
Robin 7ec5798e11 by Robin at 20241216 2024-12-16 14:10:16 +08:00
wangxinyu 5a3ebbbb7c feat: 会员看原图 2024-12-13 17:42:12 +08:00
chenhao a985a5717d Merge pull request 'feat-IRONFANS-212-Robin' (#892) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/892
2024-12-13 17:22:00 +08:00
Robin efaefd15a7 by Robin at 20241212 2024-12-13 15:16:31 +08:00
Robin 248969082d Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-12 14:30:23 +08:00
Robin 22d07db708 by Robin at 20241212 2024-12-12 14:22:53 +08:00
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 afd4108967 by Robin at 20241211 2024-12-11 18:16:16 +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
Robin 3ebc0b6204 Merge branch 'feat-IRONFANS-250-Robin' into conf-250 2024-12-09 14:48:40 +08:00
wangxinyu 7f86bc7d9f Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-09 10:47:27 +08:00
wangxinyu 7a2969236f fix: consts 2024-12-09 10:46:42 +08:00
wangxinyu 4e4b603a43 fix: 参数校验和日志 2024-12-09 10:44:20 +08:00
Robin 289b4616ad by Robin at 20241206 2024-12-06 17:41:45 +08:00
chenhao b9de1a1f58 Merge pull request 'by Robin at 20241204' (#869) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/869
2024-12-04 16:56:16 +08:00
Robin b9f7164a33 by Robin at 20241204 2024-12-04 16:55:33 +08:00
Robin d3a93f0fbc Merge branch 'feat-IRONFANS-212-Robin' into test 2024-12-03 14:53:14 +08:00
Robin 495980a255 by Robin at 20241203 2024-12-03 14:52:07 +08:00
Robin 8a623283c2 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-03 14:05:22 +08:00
Robin 89e840ec75 by Robin at 20241203 2024-12-03 14:00:36 +08:00
Robin 8d1229aa79 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-02 16:02:53 +08:00
Robin b408f1ff16 by Robin at 20241129 2024-11-29 17:30:12 +08:00
Robin 1ff5c87a88 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into feat-IRONFANS-212-Robin-Rebase2 2024-11-28 16:26:37 +08:00
Robin 131f55d8bf Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-27 16:25:19 +08:00
Robin 7be56f9775 by Robin at 20241127 2024-11-27 15:31:48 +08:00
chenhao 90b1d6e0aa Merge pull request 'by Robin at 20241127' (#846) from feat-IRONFANS-212-Robin-Rebase into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/846
2024-11-27 13:24:30 +08:00
Robin f03238d753 by Robin at 20241127 2024-11-27 13:19:54 +08:00
Robin 7d82065430 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-26 16:31:36 +08:00
Robin dd96ceb00c Merge branch 'feat-IRONFANS-248-Robin' into conf-248 2024-11-26 16:16:32 +08:00
Robin 340e6f400f by Robin at 20241126 2024-11-26 15:02:20 +08:00
Robin de25330b3e 1 2024-11-25 17:40:43 +08:00
Robin 34759baafc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-25 17:12:59 +08:00
Robin 9e41c962e4 1 2024-11-25 17:10:27 +08:00
Robin fd0142a96a Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:24:18 +08:00
Robin 7957ee977b 1 2024-11-25 15:17:44 +08:00
Robin 10c733b972 by Robin at 20241125; guild registration 2024-11-25 15:15:29 +08:00
chenhao 160c54dfba Merge pull request 'BUG-20241119' (#810) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/810
2024-11-20 16:46:27 +08:00
Leufolium 067de8dcc4 by Robin at 20241120 2024-11-20 16:45:58 +08:00