Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

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

@@ -139,7 +139,7 @@
     */
    @ApiModelProperty(value = "会员等级")
    @NotEmpty(message = "会员等级不能为空")
    private String vipGrade;
    private Integer memberId;


    @ApiModelProperty(value = "指定的用户列表id")