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

无关风月

5 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

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