Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 bc9bd69850c95dacb22c7da4777a1d0470c33722

 src/main/java/com/mzl/flower/dto/response/coupon/CouponTemplateVipVO.java

@@ -147,4 +147,16 @@
    @ApiModelProperty(value = "每人限领")
    private Integer getLimit;

    /**
     * 发放数量
     */
    @ApiModelProperty(value = "发放数量")
    private Integer couponAmount;

    @ApiModelProperty(value = "发放时间")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8")
    @DateTimeFormat
    private LocalDateTime createTime;


}