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

陶杰

2024-09-03 d21eb0c32effc88e570be573743da0dec57600c2

 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;


}