Commit Graph

2724 Commits

Author SHA1 Message Date
lwl0608 810c625615 fix cdn 30 2024-12-19 16:08:43 +08:00
lwl0608 9a1a894163 fix cdn 2024-12-19 16:01:42 +08:00
lwl0608 58437d5e81 cdn 2024-12-19 15:56:50 +08:00
lwl0608 3c1a18c025 cdn levianderwin 2024-12-19 15:53:35 +08:00
lwl0608 beba442bc8 Merge branch 'dev-lwl/app_levi' 2024-12-19 15:31:39 +08:00
lwl0608 6a3cadd749 Merge branch 'dev-lwl/app_levi' into test 2024-12-19 15:31:31 +08:00
lwl0608 4cbb28901e 9900 2024-12-19 15:31:27 +08:00
lwl0608 ca858417c3 test tiefen.space 2024-12-19 15:15:42 +08:00
chenhao f612462c68 Merge pull request 'feat-IRONFANS-212-Robin' (#919) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/919
2024-12-19 15:07:27 +08:00
lwl0608 e7bd6e12dc Merge branch 'dev-lwl/app_levi' into test 2024-12-19 15:02:29 +08:00
lwl0608 d786f894fe app_levi 2024-12-19 15:02:24 +08:00
lwl0608 882da16813 Merge branch 'dev-lwl/app_levi' into test 2024-12-19 15:01:38 +08:00
Robin a81ab39cf8 by Robin at 20241219 2024-12-19 15:00:10 +08:00
lwl0608 af3db30c23 app_levi 2024-12-19 14:59:01 +08:00
Robin d78ed6a1ce by Robin at 20241219 2024-12-19 14:50:29 +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
lwl0608 8212f7da51 levi service 2024-12-19 14:41:03 +08:00
wangxinyu 50b704a177 Merge branch 'feature-fans_identity_refresh-wxy-20241216' into test 2024-12-19 13:46:34 +08:00
wangxinyu 2117e782fb fix: 铁粉降价后,满足条件的用户解锁铁粉 2024-12-19 13:45:35 +08:00
lwl0608 6ae8143ff0 Merge branch 'dev-lwl/alipay_add' into test 2024-12-19 12:47:50 +08:00
lwl0608 d90df99435 fix path 2024-12-19 12:47:46 +08:00
lwl0608 4906fbfddb add log 2024-12-19 12:44:39 +08:00
lwl0608 3e14bb14e9 test aliapy whqm 2024-12-19 11:39:53 +08:00
lwl0608 20674e9435 Merge branch 'dev-lwl/alipay_add' into test 2024-12-19 11:39:04 +08:00
lwl0608 95976cfa84 whqm 2024-12-19 11:38:55 +08:00
lwl0608 c36d726535 Merge branch 'dev-lwl/finxxx' into test 2024-12-18 21:42:52 +08:00
lwl0608 13923a1828 fix panic 2024-12-18 21:41:23 +08:00
wangxinyu 853a368fd1 Merge branch 'feature-streamer_nick_audit-wxy-20241209' into test 2024-12-18 16:55:37 +08:00
wangxinyu a2319ffad1 fix: 普通用户修改昵称 2024-12-18 16:54:22 +08:00
chenhao b90c500bf7 Merge pull request '1' (#918) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/918
2024-12-18 16:01:40 +08:00
Robin ed1874ba45 1 2024-12-18 16:01:20 +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 54a4456d9b Merge branch 'feature-pay_picture-wxy-20241216' into test 2024-12-18 15:00:16 +08:00
wangxinyu edcb966903 fix: 原图 2024-12-18 14:59:55 +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 9d56599129 fix: 合代码问题2 2024-12-18 14:37:08 +08:00
wangxinyu 1f4e2c1109 fix: 合代码问题 2024-12-18 14:24:03 +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
wangxinyu 59f0709684 Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into test 2024-12-17 17:18:40 +08:00
wangxinyu 9824b8e5bb fix:用户退款时间改为 24 小时 2024-12-17 17:17:56 +08:00
chenhao 2ee325a643 Merge pull request 'by Robin at 20241217' (#916) from feat-IRONFANS-1000063-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/916
2024-12-17 16:53:41 +08:00
Robin 85d8ed2b14 by Robin at 20241217 2024-12-17 16:53:23 +08:00
chenhao d05dcb286f Merge pull request 'by Robin at 20241217' (#915) from feat-IRONFANS-1000063-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/915
2024-12-17 16:38:21 +08:00
Robin 8ca149f002 by Robin at 20241217 2024-12-17 16:37:59 +08:00
wangxinyu 6bd7b57313 Merge remote-tracking branch 'origin/feature-streamer_nick_audit-wxy-20241209' into test 2024-12-17 16:31:17 +08:00
wangxinyu 44969d364a fix:昵称审核,修改头像覆盖昵称问题修复3 2024-12-17 16:30:43 +08:00