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-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 9bf8eac..1b3d580 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
@@ -40,7 +40,7 @@
 
 
     @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
-    public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
+    public void saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
 
 
     @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")

--
Gitblit v1.7.1