diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java index 127805bed..ab2375be6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/WxOrderReportDto.java @@ -2,6 +2,8 @@ package com.iformall.domain.dto; import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import java.util.Date; @@ -9,6 +11,8 @@ import java.util.Date; * Created by syf on 2018/8/30. */ @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxOrderReportDto extends BaseEntity{ private String tenantId; private Long merchantId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index a40bb2377..42441554c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -3,16 +3,20 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; import com.iformall.common.SortColumn; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.*; import java.math.BigDecimal; import java.util.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_merchant_subsidy") @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMerchantSubsidy extends BaseEntity { @Id protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java index 01a79f05c..4f5b5b735 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubsidy.java @@ -1,16 +1,19 @@ package com.iformall.domain.po; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; + import javax.persistence.*; import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; @Table(name = "wx_subsidy") @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxSubsidy extends BaseEntity { @Id diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java index 9a2c50259..277a23d69 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java @@ -2,15 +2,18 @@ package com.iformall.domain.po.msg; import com.iformall.domain.po.BaseEntity; import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import javax.persistence.Transient; -import java.io.Serializable; /** * @author luozukai * @date 2019/3/7 10:05 */ @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class BaseMsg extends BaseEntity { private static final long serialVersionUID = 923764283764823L; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java index fa4434a8c..8c1d66aa4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderGroupMarketing.java @@ -2,10 +2,12 @@ package com.iformall.domain.vo; import com.iformall.domain.po.BaseEntity; import lombok.Data; - -import java.io.Serializable; +import lombok.EqualsAndHashCode; +import lombok.ToString; @Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxOrderGroupMarketing extends BaseEntity { private String tenantId;