From dba8f9148bb84cd2efbb2d8f87d0dc93ac78f7ae Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 1 Aug 2019 13:37:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=AF=BC=E5=85=A5][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=97=A5=E5=B8=B8=E3=80=81=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E5=8F=8A=E5=85=B6=E4=BB=96=E6=8A=BC=E9=87=91=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/WxBillExcelTemplateOther.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 96fc6cc49..cb81a2dc6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateOther.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillExcelTemplateOther.java @@ -2,7 +2,6 @@ package com.iformall.domain.vo; import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; -import lombok.EqualsAndHashCode; import java.util.Date; @@ -10,8 +9,13 @@ import java.util.Date; * @author gongbiao */ @Data -@EqualsAndHashCode(callSuper = true) -public class WxBillExcelTemplateOther extends WxBillExcelTemplate { +public class WxBillExcelTemplateOther { + + @Excel(name = "商户名*", width = 20, orderNum = "1") + private String merchantName; + + @Excel(name = "费用类型*", width = 20, orderNum = "2", replace = {"商铺租金_1", "多经点位租金_2", "商铺物业费_3", "多经点位物业费_4", "日常费用_5", "其他费用_6", "其他押金_7"}) + private Integer billType; @Excel(name = "费用名称*", width = 20, orderNum = "3") private String billAttr; @@ -36,4 +40,7 @@ public class WxBillExcelTemplateOther extends WxBillExcelTemplate { @Excel(name = "收款方式", width = 20, orderNum = "10") private String payWay; + private Long merchantId; + private Integer merchantType; + }