From 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 21 一月 2025 18:15:00 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
index ddab429..b29a0a4 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java
@@ -87,6 +87,9 @@
     @PostMapping("/base/pointMerchars/addOther")
     Boolean addOther(@RequestBody String pam);
 
+    @PostMapping("/base/pointMerchars/addOther1")
+    Boolean addOther1(@RequestBody String pam1);
+
     @PostMapping("/base/pointMerchars/addCitys")
     Boolean addCitys(@RequestBody List<Map<String, String>> objects);
 
@@ -103,5 +106,9 @@
     @PostMapping("/base/pointMerchars/queryFee")
     HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
 
-
+    /**
+     * 根据id查询
+     */
+    @RequestMapping("/base/pointMerchars/getById")
+    PointsMerchandise getById(@RequestBody Integer id);
 }

--
Gitblit v1.7.1