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-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java |    3 ---
 1 files changed, 0 insertions(+), 3 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 2ffb151..6d4533e 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
@@ -17,9 +17,6 @@
     @PostMapping("/base/pointMerchars/convertGoods")
     public List<IntegralCommodity> getConvertibleGoods();
 
-    @PostMapping("/base/pointMerchars/getCommoditys")
-    public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request);
-
     @PostMapping("/base/pointMerchars/getRedeemedNums")
     public int getRedeemedQuantity(@RequestBody Integer goodId);
 

--
Gitblit v1.7.1