Merge remote-tracking branch 'origin/master' into master-v2

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

 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;


}