Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-04 498557d0fd3b2bc14b446626cbc8a63a52fa83cb

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

@@ -100,8 +100,8 @@
    private Integer point;

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

}