Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 a80311f4fb0ecad83e8bc3df59a3d596d637c0ba

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