Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-28 52cfd50f3a812bf1c0a4c3ef2f1e65fcf8579adb

 cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java

@@ -87,6 +87,11 @@
        return availableVos;
    }

    @PostMapping("/base/userConpon/queryCouponRules")
    public Map<String,Object> getCouponRules(@RequestBody Integer couponId){
        return cService.queryConponRuleOfJson(couponId);
    }



    @ResponseBody