From fd26b283afbdcd0ea32bc22c7248d960f695ca0d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 21 May 2019 19:48:24 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][ID1001568][dev=20version:.1190.1685:?= =?UTF-8?q?=E6=97=A5=E5=B8=B8=E8=B4=B9=E7=94=A8=E8=B4=A6=E5=8D=95-?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E9=9C=80=E8=A6=81=E5=92=8C=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E4=BF=9D=E6=8C=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/domain/po/WxBillDaily.java | 2 +- .../src/main/java/com/iformall/domain/vo/WxBillDailyVo.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java index ea3b68c4c..6191c6adb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java @@ -49,7 +49,7 @@ public class WxBillDaily extends BaseEntity{ @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") private Long pay; - @Excel(name = "截止收款日期", orderNum = "5", width = 20, format = "yyyy-MM-dd") + @Excel(name = "缴款截止日期", orderNum = "5", width = 20, format = "yyyy-MM-dd") @NotNull @SortColumn(column = "receiveDate") @io.swagger.annotations.ApiModelProperty(value="截止收款日期",name="receiveDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java index af664e82a..e179075ec 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxBillDailyVo.java @@ -22,12 +22,12 @@ public class WxBillDailyVo extends WxBillDaily { @io.swagger.annotations.ApiModelProperty(value = "商铺号", name = "shopNumber") private String shopNumber; - @Excel(name = "实际应收金额", orderNum = "3", width = 20, numFormat = "#.##") + @Excel(name = "实际应收金额(元)", orderNum = "3", width = 20, numFormat = "#.##") @NotNull @io.swagger.annotations.ApiModelProperty(value = "实际应收金额", name = "receivePayStr") private String receivePayStr; - @Excel(name = "实收金额", orderNum = "4", width = 20, numFormat = "#.##") + @Excel(name = "实收金额(元)", orderNum = "4", width = 20, numFormat = "#.##") @NotNull @io.swagger.annotations.ApiModelProperty(value = "实收金额", name = "payStr") private String payStr;