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

gongzuming

2024-09-26 af77899d830e854d01b48bc12db04b02116e5ea4

 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;


}