Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-08 27b2410ba89a2c73097f7f901fb9bc1c72913a3b

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

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

    /**
     * 状态（coupon_record_status）未使用、已使用、已过期
@@ -100,8 +100,8 @@
    private Integer point;

    /**
     * 订单号
     * 会员等级
     */
    private String orderNo;
    private Integer memberId;

}