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

gongzuming

2024-09-11 4012d7c9e7991a86c86af7516559e9b3bce551ee

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

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

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

}