Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-04 498557d0fd3b2bc14b446626cbc8a63a52fa83cb

 src/main/java/com/mzl/flower/dto/request/coupon/CreateCouponTemplatePointDTO.java

@@ -87,8 +87,4 @@



    @ApiModelProperty(value = "领取后有效类型名称")
    private String usageTimeTypeName;


}