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

gongzuming

2024-09-02 cdabe8b7b132b8d947020fa6e528c8d3dbfa9b41

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

@@ -144,4 +144,12 @@
    @ApiModelProperty(value = "领取后有效时间整数")
    private Integer usageTimeNum;

    @ApiModelProperty(value = "使用时间类型（COUPON_USAGE_TYPE）")
    @DictTrans(target = "usageTypeName",codeType = "COUPON_USAGE_TYPE")
    private String usageType;

    @ApiModelProperty(value = "使用时间类型")
    private String usageTypeName;


}