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

gongzuming

2024-09-20 875de0f786639bc089ff54aeb9a2fcabdf5f832b

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

@@ -35,4 +35,10 @@
    @ApiModelProperty(value = "领取用户类型-全部用户，指定用户")
    private String getUserType;

    @ApiModelProperty(value = "优惠券模版ID")
    private String couponId;

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

}