 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 |
|
lwl0608
|
29f3073520
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 17:17:29 +08:00 |
|
lwl0608
|
e33b76ba66
|
fix xinyidaole
|
2024-12-09 17:17:13 +08:00 |
|
lwl0608
|
7098dd4120
|
fix
|
2024-12-09 17:14:42 +08:00 |
|
lwl0608
|
7e3874e752
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 17:11:39 +08:00 |
|
lwl0608
|
2848425315
|
fix
|
2024-12-09 17:11:34 +08:00 |
|
lwl0608
|
3c60ebc417
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 17:00:01 +08:00 |
|
lwl0608
|
2ade2cf3b4
|
fix
|
2024-12-09 16:59:58 +08:00 |
|
lwl0608
|
2b85e3c54c
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 16:46:35 +08:00 |
|
lwl0608
|
a7bf994a00
|
chagne log dir
|
2024-12-09 16:46:14 +08:00 |
|
lwl0608
|
bb529375d8
|
merge
|
2024-12-09 16:44:34 +08:00 |
|
lwl0608
|
293dd70d67
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 16:44:14 +08:00 |
|
lwl0608
|
3a873c13a3
|
add
|
2024-12-09 16:44:08 +08:00 |
|
lwl0608
|
b6085d518a
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
|
2024-12-09 16:32:44 +08:00 |
|
lwl0608
|
724249bf6a
|
cancel ws
|
2024-12-09 16:32:37 +08:00 |
|
lwl0608
|
e59615c963
|
merge
|
2024-12-09 16:28:10 +08:00 |
 chenhao
|
67c3dfc8af
|
Merge pull request 'by Robin at 20241209' (#875) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/875
|
2024-12-09 16:26:11 +08:00 |
Robin
|
16b2d31fb5
|
by Robin at 20241209
|
2024-12-09 16:24:52 +08:00 |
|
lwl0608
|
87e344c636
|
Merge branch 'dev-lwl/withraw_sync_alipay' into test
# Conflicts:
# app/mix/dao/mongo.go
# app/mix/dao/mongo_vas.go
# dbstruct/vas_mongo.go
|
2024-12-09 16:20:13 +08:00 |
|
wangxinyu
|
d973389e98
|
feat: 主播微信号不能设置[wxid]开头的初始微信
|
2024-12-09 16:18:43 +08:00 |
|
lwl0608
|
00c4baba5f
|
/withraw_sync_alipay
|
2024-12-09 16:08:19 +08:00 |
|
wangxinyu
|
aeb26c06b7
|
Merge remote-tracking branch 'origin/test' into test
|
2024-12-09 15:12:01 +08:00 |
|
wangxinyu
|
e365c3b1af
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 15:08:14 +08:00 |
|
wangxinyu
|
7ef275a85e
|
fix: 分页
|
2024-12-09 15:01:37 +08:00 |
|
chenhao
|
2f71646c6d
|
Merge pull request 'by Robin at 20241209' (#874) from feat-IRONFANS-250-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/874
|
2024-12-09 14:53:27 +08:00 |
|
Robin
|
10abcad30f
|
by Robin at 20241209
|
2024-12-09 14:52:49 +08:00 |
|
chenhao
|
43934d201b
|
Merge pull request 'conf-250' (#873) from conf-250 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/873
|
2024-12-09 14:49:25 +08:00 |
|
Robin
|
3ebc0b6204
|
Merge branch 'feat-IRONFANS-250-Robin' into conf-250
|
2024-12-09 14:48:40 +08:00 |
|
wangxinyu
|
86e6bb4281
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 13:46:32 +08:00 |
|
wangxinyu
|
468b1cbea9
|
fix: 退款参数校验，非本人id 操作
|
2024-12-09 12:21:42 +08:00 |
|
wangxinyu
|
1d76ad43c4
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-09 11:41:34 +08:00 |
|
wangxinyu
|
10af8eab2d
|
fix: list 改成空数组，offset修改
|
2024-12-09 11:40:55 +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 |
|
wangxinyu
|
87c0ffc9bd
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
# Conflicts:
# app/mix/controller/zone_vas_api.go
|
2024-12-06 18:17:49 +08:00 |
|
wangxinyu
|
6dc5cbd36a
|
Merge remote-tracking branch 'origin/feature-refund_v2-wxy-20241204' into feature-refund_v2-wxy-20241204
|
2024-12-06 18:15:42 +08:00 |
|
wangxinyu
|
2a9379677b
|
fix: 参数校验
|
2024-12-06 18:15:28 +08:00 |
|
Robin
|
289b4616ad
|
by Robin at 20241206
|
2024-12-06 17:41:45 +08:00 |