Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

 src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateActivyController.java

@@ -78,6 +78,7 @@
        }

        CreateCouponTemplateBO couponTemplateBO = new CreateCouponTemplateBO();
        BeanUtils.copyProperties(couponTemplateDO,couponTemplateBO);
        BeanUtils.copyProperties(dto, couponTemplateBO);

        // 设置成积分优惠券