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

gongzuming

2024-09-12 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a

 src/main/java/com/mzl/flower/dto/request/coupon/QueryCouponRecordDTO.java

@@ -38,4 +38,7 @@
    @ApiModelProperty(value = "优惠券模版ID")
    private String couponId;

    @ApiModelProperty(value = "优惠券种类")
    private String category;

}