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

gongzuming

2024-08-30 84f1e606d3cdd3733b0e92927bd46bf60ad93063

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

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

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