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

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

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