From efc09045da6ca5fc06ff9221723ed9ddf81e568e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 09 八月 2023 09:32:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
index 6d4533e..3fb2b93 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
@@ -24,9 +24,6 @@
     @PostMapping("/base/pointMerchars/getGoodDetails")
     ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest);
 
-    @PostMapping("/base/pointMerchars/getDetailsOfExchange")
-    List<ExchangeDetailsResponse> getIntegralExchangeDetails(@RequestBody Integer appUserId);
-
 
     @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
     public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId);
@@ -34,10 +31,6 @@
 
     @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
     public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
-
-
-    @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
-    public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
 
     @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
     public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);

--
Gitblit v1.7.1