From b27420f3e0cbb0de34c34ddd308dd4baf7d4b225 Mon Sep 17 00:00:00 2001 From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com> Date: 星期二, 10 九月 2024 08:29:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2 --- src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java index 3fdb745..bc19ba0 100644 --- a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java +++ b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java @@ -100,8 +100,8 @@ private Integer point; /** - * 订单号 + * 会员等级 */ - private String orderNo; + private Integer memberId; } -- Gitblit v1.9.3