From eefca656c6352a1e82889a863d0119d3f22731c9 Mon Sep 17 00:00:00 2001 From: paulGao Date: Tue, 10 Jan 2023 14:34:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/promotion/entity/vos/MemberCouponVO.java | 7 +++++++ .../promotion/serviceimpl/MemberCouponServiceImpl.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/MemberCouponVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/MemberCouponVO.java index 60ccef17..06f06a19 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/MemberCouponVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/MemberCouponVO.java @@ -4,6 +4,7 @@ import cn.lili.common.utils.BeanUtil; import cn.lili.modules.promotion.entity.dos.MemberCoupon; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; /** * MemberCouponVO @@ -12,9 +13,15 @@ import lombok.Data; * @version v1.0 * 2021-08-24 14:30 */ +@EqualsAndHashCode(callSuper = true) @Data public class MemberCouponVO extends MemberCoupon { + private static final long serialVersionUID = -5533168813075444962L; + + @ApiModelProperty(value = "优惠券名称") + private String couponName; + @ApiModelProperty(value = "无法使用原因") private String reason; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 2cc8c158..1da8f0a6 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -316,10 +316,10 @@ public class MemberCouponServiceImpl extends ServiceImpl