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/activity/MerChandiseClient.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
index b7e381a..ebc2f3f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
@@ -19,7 +19,7 @@
 
 
     @PostMapping("/base/pointMerchars/getCommoditys")
-    public List<PointsMerchandise> getVicinityGoods(@RequestBody CommodityRequest request);
+    PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request);
 
     @PostMapping("/base/pointMerchars/getRedeemedNums")
     public int getRedeemedQuantity(@RequestBody Integer goodId);

--
Gitblit v1.7.1