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

gongzuming

2024-09-10 6d6f3ecc111080094e91fd002e1990dcfa9783e6

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

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

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

}