From 2863549f8fc34064b84b3124d16986f95ce24c60 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 18 May 2019 13:37:03 +0800 Subject: [PATCH] =?UTF-8?q?[lombok][=E4=BF=AE=E6=94=B9]:warning=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/po/WxCampaign.java | 4 ++++ .../java/com/iformall/domain/po/WxTopic.java | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java index bdaeaa791..ff7976c32 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCampaign.java @@ -2,6 +2,8 @@ package com.iformall.domain.po; import com.iformall.domain.vo.WxCouponChannelVo; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -12,6 +14,8 @@ import java.util.List; @Table(name = "wx_campaign") @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxCampaign extends BaseEntity { @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java index ea15290d4..dee2b4f96 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTopic.java @@ -1,6 +1,8 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Id; import javax.persistence.Table; @@ -10,6 +12,8 @@ import java.util.List; @Table(name = "wx_topic") @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxTopic extends BaseEntity{ @Id @@ -53,6 +57,7 @@ public class WxTopic extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="状态,一个或者多个",name="statusStr") private String statusStr; @Transient + @io.swagger.annotations.ApiModelProperty(value="状态,一个或者多个",name="statusList") protected List statusList; // @Transient @@ -63,14 +68,9 @@ public class WxTopic extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="上架标志 1正在上架",name="isOnline") private Integer isOnline; @Transient + @io.swagger.annotations.ApiModelProperty(value="couponChannelId渠道ID",name="couponChannelId") private Long couponChannelId; - @Override - public String getSortColumns() { - super.setSortColumns(this.sortColumns); - return super.getSortColumns(); - } - @Transient @io.swagger.annotations.ApiModelProperty(value="小程序路径",name="weappPath") private String weappPath; @@ -79,6 +79,12 @@ public class WxTopic extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") private String weappScene; + @Override + public String getSortColumns() { + super.setSortColumns(this.sortColumns); + return super.getSortColumns(); + } + public String getWeappPath() { if(id == null) return "pages/index/index";