From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
index fc6962a..d9c28e7 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/competition/DeductionCompetitionsClient.java
@@ -1,6 +1,7 @@
package com.dsh.account.feignclient.competition;
+import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.competition.model.GetStuSourseList;
import com.dsh.account.feignclient.competition.model.PaymentCompetition;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
@@ -16,10 +17,10 @@
List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList getStuSourseList);
@PostMapping("/base/competition/getPayedCompetitions")
- List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody Integer appUserId);
+ List<PaymentCompetition> getAllCompetitionPayRecord(@RequestBody BillingDataRequestVo requestVo);
@PostMapping("/base/competition/getCancelOrderOfUserPay")
- public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody Integer appUserId);
+ public List<PaymentCompetition> getCancelOrderOfUserPayRecord(@RequestBody BillingDataRequestVo appUserId);
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId);
--
Gitblit v1.7.1