Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/modules/common/controller/CouponController.java

@@ -110,6 +110,8 @@ public class CouponController {
     public R getCouponInfo(@RequestBody Map<String,Object> params){
         CouponEntity couponEntity = couponService.getByIdSetRange(Integer.parseInt(params.get("id").toString()));
         couponService.setRangeList(couponEntity);
+        couponEntity.setGrantCount(couponHistoryService.count(new LambdaQueryWrapper<CouponHistory>()
+                .eq(CouponHistory::getCouponId,couponEntity.getId())));
         return R.ok().put("couponEntity",couponEntity);
     }