Merge branch 'master' into master-v2

Cui Zhi Feng

2024-09-05 9adfc0c5aa084bc61807ce43badf8b9f48b588c3

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

@@ -100,11 +100,6 @@
    private Integer point;

    /**
     * 订单号
     */
    private String orderNo;

    /**
     * 会员等级
     */
    private Integer memberId;