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; /**