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

gongzuming

2024-09-08 55db77e61e5a55c30dc19d599dadcfc1469c962e

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

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

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

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