Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-31 9c6e78ea55ef4c865b8148a5ca47322504ed1f50

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

@@ -13,9 +13,7 @@
    @ApiModelProperty(value = "优惠券类型")
    private String couponDiscountType;


    @ApiModelProperty(value = "id")
    private String id;


}