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

gongzuming

2024-10-14 58a8acceb63d52377da4b837e859f2e03d2bce1b

 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;


}