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

gongzuming

2024-09-02 0d864c9bf892fd7c56600e197072e07c57847b34

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

@@ -104,4 +104,9 @@
     */
    private String orderNo;

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

}