 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
|
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 |
|
lwl0608
|
aac52a544f
|
change firenze etc
|
2024-12-23 15:08:40 +08:00 |
|
lwl0608
|
c60b99a1e1
|
Merge branch 'dev-lwl/firenze'
|
2024-12-23 15:07:31 +08:00 |
|
lwl0608
|
36e64af325
|
Merge branch 'dev-lwl/firenze' into test
|
2024-12-23 15:07:16 +08:00 |
|
lwl0608
|
35dd3a5e16
|
change ip
|
2024-12-23 15:07:07 +08:00 |
|
lwl0608
|
808aed04d1
|
merge
|
2024-12-23 14:41:27 +08:00 |
|
lwl0608
|
4da76794e1
|
merge
|
2024-12-23 14:40:46 +08:00 |
|
lwl0608
|
b9c56a4213
|
opt_firenze
|
2024-12-23 14:40:07 +08:00 |
|
lwl0608
|
5e2616b50e
|
chagne test /vip
|
2024-12-20 17:19:51 +08:00 |
|
lwl0608
|
8ed59f3be6
|
change
|
2024-12-20 17:18:58 +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
|
d9db4f5342
|
Merge branch 'feature-fans_identity_refresh-wxy-20241216' into test
|
2024-12-20 16:25:32 +08:00 |
|
wangxinyu
|
289a132eb7
|
return
|
2024-12-20 16:25:13 +08:00 |
|
wangxinyu
|
e1778754ff
|
merge
|
2024-12-20 16:21:12 +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 |
|
lwl0608
|
175d212244
|
fix cdn
|
2024-12-19 19:36:57 +08:00 |
|
lwl0608
|
6af9eed12b
|
mege
|
2024-12-19 18:57:04 +08:00 |
|
lwl0608
|
13505eec5c
|
fix cold_config no jwt
|
2024-12-19 18:56:29 +08:00 |
|
lwl0608
|
97380ed80b
|
zid
|
2024-12-19 16:53:41 +08:00 |
|
lwl0608
|
72ab59c9fe
|
rollback
|
2024-12-19 16:30:27 +08:00 |