From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +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