From 8afc5bfc1e5df1e2f0a8872a344da3b3fd5d63b9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 20:24:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PointMercharsClient.java |    3 +++
 1 files changed, 3 insertions(+), 0 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 050a5a3..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);
 

--
Gitblit v1.7.1