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

gongzuming

2024-09-26 e468d0b56e1c33f047bee84ca8c9a142c769fe16

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

@@ -7,8 +7,8 @@
@Data
public class QueryExistCouponDTO {

    @ApiModelProperty(value = "优惠券ID")
    private String customerId;
    @ApiModelProperty(value = "商户ID")
    private Long customerId;

    @ApiModelProperty(value = "优惠券ID")
    private String couponId;