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

gongzuming

2024-09-08 aa8652cc420f84bd3e543ebe611a563e852d4725

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

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

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

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