Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

 src/main/java/com/mzl/flower/entity/coupon/CouponTemplateDO.java

@@ -136,7 +136,7 @@
    private Integer point;

    @ApiModelProperty(value = "会员等级")
    private String vipGrade;
    private Integer memberId;


}