Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

 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);