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 | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 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 cfc3594..ae21831 100644 --- a/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java +++ b/src/main/java/com/mzl/flower/entity/coupon/CouponRecordDO.java @@ -100,13 +100,18 @@ private Integer point; /** - * 订单号 - */ - private String orderNo; - - /** * 会员等级 */ private Integer memberId; + /** + * 优惠券图片 + */ + private String imageUrl; + + /** + * 优惠券描述(使用规则) + */ + private String couponDescription; + } -- Gitblit v1.9.3