| @@ -2,7 +2,6 @@ package com.iformall.domain.vo; | |||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| @@ -10,8 +9,13 @@ import java.util.Date; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Data | @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") | @Excel(name = "费用名称*", width = 20, orderNum = "3") | ||||
| private String billAttr; | private String billAttr; | ||||
| @@ -36,4 +40,7 @@ public class WxBillExcelTemplateOther extends WxBillExcelTemplate { | |||||
| @Excel(name = "收款方式", width = 20, orderNum = "10") | @Excel(name = "收款方式", width = 20, orderNum = "10") | ||||
| private String payWay; | private String payWay; | ||||
| private Long merchantId; | |||||
| private Integer merchantType; | |||||
| } | } | ||||