Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 852ec1d729b61077d8131591a5349c7e4a1bed79

 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;