From d7819bb819cd897d5933ac98bdec7e3ccc70846c Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:55:24 +0800
Subject: [PATCH] fix: 冲突
---
src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 964e122..ae21831 100644
--- a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
+++ b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java
@@ -33,7 +33,7 @@
/**
* 商户ID
*/
- private String customerId;
+ private Long customerId;
/**
* 状态（coupon_record_status）未使用、已使用、已过期
@@ -100,8 +100,18 @@
private Integer point;
/**
- * 订单号
+ * 会员等级
*/
- private String orderNo;
+ private Integer memberId;
+
+ /**
+ * 优惠券图片
+ */
+ private String imageUrl;
+
+ /**
+ * 优惠券描述(使用规则)
+ */
+ private String couponDescription;
}
--
Gitblit v1.9.3