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