 wangxinyu
|
19130f931d
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-06 12:34:54 +08:00 |
|
wangxinyu
|
c56de2019c
|
fix: refund_list 入参 Zid 改为 BMid
|
2024-12-06 12:34:30 +08:00 |
|
wangxinyu
|
174e5045af
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-06 10:58:30 +08:00 |
|
wangxinyu
|
5ee947622a
|
feat:xxl-job 扫描主播审批超时的退款单
|
2024-12-06 10:58:02 +08:00 |
|
wangxinyu
|
6264ce5b17
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 16:24:00 +08:00 |
|
wangxinyu
|
e24b88cb3a
|
fix: int64
|
2024-12-05 16:23:29 +08:00 |
|
wangxinyu
|
250e1f72cb
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 13:53:05 +08:00 |
|
wangxinyu
|
a939417d72
|
fix: mongo _id update 2
|
2024-12-05 13:51:40 +08:00 |
|
wangxinyu
|
96d2c62ae1
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
|
2024-12-05 13:22:13 +08:00 |
|
wangxinyu
|
6b06346550
|
fix: mongo _id update
|
2024-12-05 13:21:37 +08:00 |
|
wangxinyu
|
921c97f895
|
Merge branch 'feature-refund_v2-wxy-20241204' into test
# Conflicts:
# app/mix/dao/mongo.go
# app/mix/dao/mongo_vas.go
# dbstruct/vas_mongo.go
|
2024-12-05 12:58:06 +08:00 |
|
wangxinyu
|
05021a4bbb
|
feat:用户退款，主播审核列表、详情、审批接口；用户退款接口修改
|
2024-12-05 11:51:59 +08:00 |
Robin
|
0baf2e070f
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-212
|
2024-12-04 16:02:36 +08:00 |
|
Robin
|
3d34992b20
|
by Robin at 20241204
|
2024-12-04 16:00:52 +08:00 |
 chenhao
|
a08d31e59c
|
Merge pull request 'feat-IRONFANS-212-Robin' (#862) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/862
|
2024-12-03 16:50:34 +08:00 |
|
Robin
|
0c6545087b
|
by Robin at 20241203
|
2024-12-03 16:49:57 +08:00 |
 lwl0608
|
fd4d750f7a
|
merge
|
2024-12-03 16:48:53 +08:00 |
|
lwl0608
|
1464052697
|
zone_url
|
2024-12-03 15:54:46 +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
|
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 |
|
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
|
056df14b1c
|
by Robin at 20241126
|
2024-11-26 16:11:42 +08:00 |
|
Robin
|
340e6f400f
|
by Robin at 20241126
|
2024-11-26 15:02:20 +08:00 |
|
Robin
|
5604e68412
|
Merge branch 'feat-IRONFANS-247-Robin' into test
|
2024-11-26 14:47:03 +08:00 |
|
Robin
|
3aed97c805
|
by Robin at 20241126
|
2024-11-26 14:44:35 +08:00 |
|
chenhao
|
329ebdae4f
|
Merge pull request '1' (#834) from feat-IRONFANS-247-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/834
|
2024-11-25 17:44:03 +08:00 |
|
Robin
|
1b10e71aa2
|
1
|
2024-11-25 17:42:51 +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 |
|
lwl0608
|
2e59c673b6
|
Merge branch 'dev-lwl/firenze' into test
|
2024-11-25 17:08:35 +08:00 |
|
Robin
|
f0b384d73a
|
1
|
2024-11-25 15:40:22 +08:00 |
|
Robin
|
fd0142a96a
|
Merge branch 'feat-IRONFANS-247-Robin' into conf-247
|
2024-11-25 15:24:18 +08:00 |
|
Robin
|
10c733b972
|
by Robin at 20241125; guild registration
|
2024-11-25 15:15:29 +08:00 |
|
lwl0608
|
88052add07
|
MustSelectMinSizeOssId
|
2024-11-24 18:31:58 +08:00 |
|
lwl0608
|
2a820135ab
|
SelectMinSizeOssId
|
2024-11-24 18:30:20 +08:00 |
|
lwl0608
|
c2b1c00ec6
|
SelectMinSizeOssId
|
2024-11-24 18:28:18 +08:00 |
|
chenhao
|
7677ebe0dd
|
Merge pull request 'BUG-20241119' (#818) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/818
|
2024-11-21 14:48:14 +08:00 |
|
Robin
|
660d636141
|
1
|
2024-11-21 14:47:44 +08:00 |
|
chenhao
|
e72f9f9614
|
Merge pull request 'by Robin at 20241121' (#817) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/817
|
2024-11-21 14:17:10 +08:00 |
|
Leufolium
|
1ac849645c
|
by Robin at 20241121
|
2024-11-21 14:15:55 +08:00 |
|
Leufolium
|
5cb17dc87b
|
Merge branch 'feat-IRONFANS-212-Robin' into conf-212
|
2024-11-15 15:10:49 +08:00 |
|
Leufolium
|
3a9b4a6827
|
by Robin at 20241115
|
2024-11-15 15:00:37 +08:00 |
|
Leufolium
|
a74773681e
|
by Robin at 20241114
|
2024-11-14 16:30:59 +08:00 |
|
chenhao
|
f74a126912
|
Merge pull request 'feat-IRONFANS-212-Robin' (#793) from feat-IRONFANS-212-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/793
|
2024-11-12 17:38:29 +08:00 |