From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 10e801c..e05a568 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
@@ -36,14 +36,14 @@
ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
- PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
+ PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
@PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);
@PostMapping("/base/pointMerchars/saveDetailsUserPointMercase")
- public Long saveDetailsUserPointMercase( UserPointsMerchandise merchandise);
+ public Long saveDetailsUserPointMercase(UserPointsMerchandise merchandise);
@PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
@@ -56,6 +56,7 @@
@PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp);
+
@PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp);
--
Gitblit v1.7.1