From 5e8c580cb534515ead9f417b2b65fbb7310a07aa Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 15 May 2019 17:56:55 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E5=88=97=E8=A1=A8][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9[=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/vo/WxBillAllVo.java | 8 ++++---- .../com/iformall/service/impl/WxBillAllServiceImpl.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java index a5a257c6f..073b57599 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillAllVo.java @@ -17,13 +17,13 @@ public class WxBillAllVo { private Long shopId; - //@Excel(name="商铺号",width = 20,orderNum = "1") + @Excel(name = "商铺号", width = 20, orderNum = "1") private String shopNumber; - //@Excel(name="商户名称",width = 20,orderNum = "2") + @Excel(name = "商户名称", width = 20, orderNum = "2") private String merchantName; - //@Excel(name="商铺类型",width = 20,orderNum = "3", replace = {"店铺_1","多经点位_2"}) + @Excel(name = "商铺类型", width = 20, orderNum = "3", replace = {"店铺_1", "多经点位_2"}) private Integer rentShopType; @Excel(name="费用类型",width = 20,orderNum = "4") @@ -44,7 +44,7 @@ public class WxBillAllVo { @Excel(name="逾期天数",width = 20,orderNum = "9") private Integer expiredDay; - @Excel(name="账单状态",width = 20,orderNum = "10", replace = {"欠缴_1","待缴_2","已结清_3","未到期_4","已退还_5","失效_6"}) + @Excel(name = "账单状态", width = 20, orderNum = "10", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6", "_7"}) private Integer status; private Integer billTypeValue; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 4273e025b..a879da667 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -230,7 +230,6 @@ public class WxBillAllServiceImpl implements WxBillAllService { Set>> entries = billMapList.entrySet(); for (Map.Entry> entry : entries) { - list.add(new WxBillAllVo()); list.addAll(entry.getValue()); }