Commit Graph

527 Commits

Author SHA1 Message Date
wangxinyu 7cd2ac2d83 Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 15:54:58 +08:00
wangxinyu b9bbb70b96 fix: 接口参数
feat: 审核校验
2024-12-05 15:54:24 +08:00
wangxinyu f5d8e04dca Merge branch 'feature-refund_v2-wxy-20241204' into test 2024-12-05 14:45:51 +08:00
wangxinyu 1e974bc7e5 fix: 接口 debug 错误修改 1 2024-12-05 14:44:39 +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 63f0788aaf Merge pull request 'by Robin at 20241204' (#866) from BUG-20241204 into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/866
2024-12-04 13:25:50 +08:00
Robin 9ecbeb768a by Robin at 20241204 2024-12-04 13:25:17 +08:00
chenhao 2035a88965 Merge pull request 'by Robin at 20241203' (#863) from feat-IRONFANS-212-Robin into test
Reviewed-on: https://git.wishpal.cn/wishpal_ironfan/service/pulls/863
2024-12-03 17:27:05 +08:00
Robin 1c3f6940dc by Robin at 20241203 2024-12-03 17:25:40 +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 2a5678f5b0 mod 2024-12-03 15:57:41 +08:00
lwl0608 1464052697 zone_url 2024-12-03 15:54:46 +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 8d1229aa79 Merge branch 'feat-IRONFANS-212-Robin' into conf-212 2024-12-02 16:02:53 +08:00
Robin b408f1ff16 by Robin at 20241129 2024-11-29 17:30:12 +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 d46ccbf188 Merge branch 'feat-IRONFANS-212-Robin-Rebase' into test 2024-11-28 16:01:14 +08:00
Robin 6a39c8925f by Robin at 20241128 2024-11-28 15:27:40 +08:00
Robin 131f55d8bf Merge branch 'feat-IRONFANS-212-Robin-Rebase' into conf-212 2024-11-27 16:25:19 +08:00
Robin f85edfa766 by Robin at 20241127 2024-11-27 16:23:15 +08:00
Robin deb84e1b4e 1 2024-11-27 16:16:08 +08:00
Robin 7be56f9775 by Robin at 20241127 2024-11-27 15:31:48 +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
chenhao 2c23e3e71c Merge pull request '1' (#838) from feat-IRONFANS-247-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/838
2024-11-26 15:05:21 +08:00
Robin 9315eb8f18 1 2024-11-26 15:04:58 +08:00
Robin 340e6f400f by Robin at 20241126 2024-11-26 15:02:20 +08:00
Robin 34759baafc Merge remote-tracking branch 'origin/main' into feat-IRONFANS-212-Robin 2024-11-25 17:12:59 +08:00
Robin fbc716b968 Merge branch 'feat-IRONFANS-247-Robin' into conf-247 2024-11-25 15:44:21 +08:00
Robin 4605bf9347 1 2024-11-25 15:42:46 +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
chenhao 3ae882883f Merge pull request '1' (#827) from feat-IRONFANS-245-Robin into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/827
2024-11-22 16:11:11 +08:00
Robin af1d5137ad 1 2024-11-22 16:10:52 +08:00
Robin a169791939 Merge branch 'feat-IRONFANS-245-Robin' into conf-245 2024-11-22 14:41:42 +08:00
Robin 909ea06a44 by Robin at 20241122 2024-11-22 14:39:41 +08:00
chenhao 9ffc4864e9 Merge pull request '1' (#821) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/821
2024-11-21 17:45:16 +08:00
Robin 3e7cdc9712 1 2024-11-21 17:44:53 +08:00
chenhao 904c7dc7ae Merge pull request '1' (#820) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/820
2024-11-21 17:16:51 +08:00
Robin 213d7b891c 1 2024-11-21 17:16:32 +08:00
chenhao dd57f3e920 Merge pull request 'BUG-20241119' (#814) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/814
2024-11-20 17:19:13 +08:00
Leufolium 5896407484 1 2024-11-20 17:18:56 +08:00
Leufolium 72fca3c8ca 1 2024-11-20 17:17:11 +08:00
chenhao 9599275a4e Merge pull request '1' (#812) from BUG-20241119 into test
Reviewed-on: http://121.41.31.146:3000/wishpal_ironfan/service/pulls/812
2024-11-20 17:07:33 +08:00