From 1ce0b56980c8b4323cd1af7fd135b798532f967f Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 24 Jul 2019 16:21:55 +0800 Subject: [PATCH] =?UTF-8?q?[po][=E4=BF=AE=E6=94=B9]:po=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxMerchantBUser.java | 2 ++ .../java/com/iformall/domain/vo/WxBillExcelTemplateDaily.java | 2 ++ .../java/com/iformall/domain/vo/WxBillExcelTemplateOther.java | 2 ++ 3 files changed, 6 insertions(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index 3a5a0b7b0..8a28cf747 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -2,6 +2,7 @@ package com.iformall.domain.po; import com.iformall.utils.Constant; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Id; import javax.persistence.Table; @@ -12,6 +13,7 @@ import java.util.UUID; @Table(name = "wx_merchant_b_user") @Data +@EqualsAndHashCode(callSuper = true) public class WxMerchantBUser extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateDaily.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateDaily.java index d54835f5a..7ca105ae2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateDaily.java @@ -2,11 +2,13 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class WxBillExcelTemplateDaily extends WxBillExcelTemplate { @Excel(name = "费用属性*", width = 20, orderNum = "3", replace = {"租金_1", "物业费_2", "水费_3", "电费_4", "空调费_5", "其他费用_6", "其他押金_7"}) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateOther.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateOther.java index 824577bcf..e3d0ee825 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateOther.java @@ -2,11 +2,13 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; +import lombok.EqualsAndHashCode; /** * @author gongbiao */ @Data +@EqualsAndHashCode(callSuper = true) public class WxBillExcelTemplateOther extends WxBillExcelTemplate { @Excel(name = "费用属性*", width = 20, orderNum = "3")