Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 e2ab3e6f3f65dee4cf4f51d8ee735738c1315af7

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

@@ -26,4 +26,7 @@
    @ApiModelProperty(value = "优惠券种类（活动优惠券、用户优惠券、会员优惠券，积分优惠券）")
    private String category;

    @ApiModelProperty(value = "优惠券状态")
    private String status;

}