Merge remote-tracking branch 'origin/master'

puzhibing

2023-12-11 66107e6f0bb5c47192eb0178aba60dc9df061be8

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/UserConponClient.java

@@ -36,5 +36,5 @@


    @PostMapping("/base/userConpon/queryCouponRules")
    Map<String,Object> getCouponRules(@RequestBody Integer couponId);
    Map<String, Object> getCouponRules(@RequestBody Integer couponId);
}