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-other/src/main/java/com/dsh/other/feignclient/SiteClient.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/SiteClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/SiteClient.java
index e71c1a3..95020b1 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/SiteClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/SiteClient.java
@@ -3,6 +3,7 @@
 import com.dsh.other.entity.SiteBooking;
 import com.dsh.other.feignclient.model.BillingDataRequestVo;
 import com.dsh.other.feignclient.model.SiteVo;
+import com.dsh.other.model.BillingRequestOfType;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +15,7 @@
 public interface SiteClient {
 
     @PostMapping("/base/site/queryPaymentSiteDetail")
-    List<SiteBooking> getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo);
+    List<BillingRequestOfType> getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo);
 
     @PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
     List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId);

--
Gitblit v1.7.1