Merge remote-tracking branch 'origin/master'

lisy

2023-07-26 4dad3d9a5bfc1b08c5338640e1f1d18c2b86ef45

 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