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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

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

@@ -135,8 +135,15 @@
     */
    private Integer point;

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

    /**
     * 优惠券图片
     */
    private String imageUrl;


}