Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-03 b6a7f6e41467f73f26fc7f209652e19ff26c3752

 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;


}