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

gongzuming

2024-09-08 55db77e61e5a55c30dc19d599dadcfc1469c962e

 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;


}