From 5dffc9a4c3897f03238cf8b6d1da2ceb68ed48a9 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 4 Jan 2024 17:43:57 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=9D=A5=E6=AC=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF--=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90?= =?UTF-8?q?=E5=91=98--=E5=AF=BC=E5=87=BA=E5=92=8C=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF--=E9=A2=84=E8=AE=A1=E5=88=B0=E8=B4=A6?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=94=B9=E4=B8=BA=E9=A2=84=E4=BC=B0=E5=88=B0?= =?UTF-8?q?=E8=B4=A6=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/member/entity/PayMemberProjectSubitem.java | 6 +++--- .../com/jero/project/entity/PayWorkingGroupSubItem.java | 6 +++--- .../jero/project/vo/excel/PayWorkingGroupSubItemExcel.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java index c8b254dd..6846005f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/entity/PayMemberProjectSubitem.java @@ -385,11 +385,11 @@ public class PayMemberProjectSubitem implements Serializable { //@TableField(exist = false) //private String postContactName; - /**预计到账日期*/ + /**预估到账日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "预计到账日期") - @Excel(name = "预计到账日期", width = 15,orderNum = "9") + @ApiModelProperty(value = "预估到账日期") + @Excel(name = "预估到账日期", width = 15,orderNum = "9") private String estimatedArrivalDate; /**预计到账开始日期*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java index bbee340f..00f34474 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkingGroupSubItem.java @@ -126,11 +126,11 @@ public class PayWorkingGroupSubItem implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal receivableAmount; - /**预计到账日期*/ + /**预估到账日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "预计到账日期") - @Excel(name = "预计到账日期",width = 15,format = "yyyy-MM-dd") + @ApiModelProperty(value = "预估到账日期") + @Excel(name = "预估到账日期",width = 15,format = "yyyy-MM-dd") private String estimatedArrivalDate; /**实收金额（元）*/ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java index 07e4934d..a0c45376 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/vo/excel/PayWorkingGroupSubItemExcel.java @@ -54,11 +54,11 @@ public class PayWorkingGroupSubItemExcel implements Serializable { @JsonFormat(shape = JsonFormat.Shape.STRING) private BigDecimal paidAmount; - /**预计到账日期*/ + /**预估到账日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - @ApiModelProperty(value = "预计到账日期") - @Excel(name = "预计到账日期",width = 15) + @ApiModelProperty(value = "预估到账日期") + @Excel(name = "预估到账日期",width = 15) private String estimatedArrivalDate; /**