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
|
b89fd9638b
|
fix: 图片链接修改
|
2024-12-23 17:18:21 +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 |
wangxinyu
|
89f4a256a9
|
Merge branch 'feature-pay_picture-wxy-20241216' into test
|
2024-12-20 17:12:39 +08:00 |
wangxinyu
|
ea97628ded
|
fix: 会员看原图,返回结构修改
|
2024-12-20 17:11:39 +08:00 |
wangxinyu
|
f14d0655db
|
Merge branch 'feature-fans_identity_refresh-wxy-20241216' into test
# Conflicts:
# app/mix/service/logic/vas.go
# app/mix/service/logic/vas_zone.go
# app/mix/service/utilservice.go
|
2024-12-20 16:20:10 +08:00 |
wangxinyu
|
8909679a8b
|
fix: 铁粉刷新,ret 和 errcode 返回
|
2024-12-20 16:17:33 +08:00 |
wangxinyu
|
095e558d08
|
Merge branch 'feature-fans_identity_refresh-wxy-20241216' into test
|
2024-12-19 14:42:22 +08:00 |
wangxinyu
|
3442269b49
|
fix: 返回文案错字
|
2024-12-19 14:41:58 +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
|
13a8ef0711
|
Merge branch 'feature-fans_identity_refresh-wxy-20241216' into test
# Conflicts:
# app/mix/service/logic/vas.go
# app/mix/service/utilservice.go
|
2024-12-18 15:50:11 +08:00 |
wangxinyu
|
ad95b3d324
|
Merge branch 'feature-pay_picture-wxy-20241216' into test
# Conflicts:
# app/mix/controller/init.go
# app/mix/service/apiservice.go
# app/mix/service/service.go
|
2024-12-18 14:40:42 +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 |
wangxinyu
|
bd77e505fb
|
feat:会员付费看原图
|
2024-12-18 13:34:14 +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 |
Robin
|
e28a2ac7a1
|
1
|
2024-12-17 13:52:26 +08:00 |
wangxinyu
|
82c89df80f
|
feat:主播涨价降价铁粉刷新
|
2024-12-17 13:51:59 +08:00 |
chenhao
|
d1d8c34cbd
|
Merge pull request 'conf-1000063' (#909) from conf-1000063 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/909
|
2024-12-17 13:38:22 +08:00 |
Robin
|
708d110069
|
Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063
|
2024-12-17 13:38:06 +08:00 |
Robin
|
50e3e76698
|
by Robin at 20241217
|
2024-12-17 13:36:31 +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 |
Robin
|
317850917a
|
Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063
|
2024-12-16 13:40:40 +08:00 |
Robin
|
2a4343553f
|
1
|
2024-12-16 13:39:46 +08:00 |
Robin
|
e19c44385d
|
Merge branch 'feat-IRONFANS-1000063-Robin' into conf-1000063
|
2024-12-16 13:37:27 +08:00 |
Robin
|
131bc242c1
|
by Robin at 20241216
|
2024-12-16 13:35:55 +08:00 |
chenhao
|
51a8a4db1c
|
Merge pull request 'by Robin at 20241213' (#896) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/896
|
2024-12-13 18:36:40 +08:00 |
Robin
|
5d64ee48e9
|
by Robin at 20241213
|
2024-12-13 18:36:29 +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 |
chenhao
|
e1b7229895
|
Merge pull request 'by Robin at 20241213' (#890) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/890
|
2024-12-13 15:45:51 +08:00 |
Robin
|
b509ee7de5
|
by Robin at 20241213
|
2024-12-13 15:45:31 +08:00 |
Robin
|
efaefd15a7
|
by Robin at 20241212
|
2024-12-13 15:16:31 +08:00 |
Robin
|
42683cc4a0
|
Merge branch 'feat-IRONFANS-250-Robin' into conf-250
|
2024-12-12 16:40:06 +08:00 |
Robin
|
52d96d568d
|
by Robin at 20241212
|
2024-12-12 16:31:44 +08:00 |
chenhao
|
6920d210ad
|
Merge pull request '1' (#886) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/886
|
2024-12-12 14:52:53 +08:00 |
Robin
|
ccae6836a8
|
1
|
2024-12-12 14:52:25 +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 |
wangxinyu
|
bbf48de065
|
Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test
|
2024-12-10 17:05:38 +08:00 |
wangxinyu
|
1fb5625ec0
|
feat: 主播修改微信昵称通过人审
|
2024-12-10 15:56:36 +08:00 |