From 5592de9cf80aa78486775a72a6224973c93146da Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 08 八月 2023 17:25:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
index a0a75a8..61a8c62 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/course/CoursePaymentClient.java
@@ -2,6 +2,8 @@
 
 import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
 import com.dsh.account.feignclient.course.model.*;
+import com.dsh.account.model.BillingRequest;
+import com.dsh.account.model.BillingRequestVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -51,7 +53,7 @@
     public boolean savePaymentCoursePackage(@RequestBody TCoursePackagePayment packagePayment);
 
     @PostMapping("/base/coursePack/allAmountPayRecordOfUser")
-    public List<TCoursePackagePayment> getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId);
+    BillingRequestVo getAmountPayRecord(@RequestBody BillingDataRequestVo appUserId);
 
     @PostMapping("/base/coursePack/obtainStudentClassDetails")
     List<RecordAppoint> obtainStudentClassDetailsData(@RequestBody WeeksOfCourseRest stuId);

--
Gitblit v1.7.1