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

陶杰

2024-09-02 b977bf61c82b7dc39079974d7316b7a80cf520fa

 src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java

@@ -33,7 +33,7 @@
    /**
     * 商户ID
     */
    private String customerId;
    private Long customerId;

    /**
     * 状态（coupon_record_status）未使用、已使用、已过期