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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

 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;

}