Merge remote-tracking branch 'origin/branch20240105' into branch20240105

2024-01-05 16:31:20 +08:00
parent b10b1222cd a50321946a
commit d723f14c12
1 changed files with 3 additions and 3 deletions
@@ -114,11 +114,11 @@ public class PayMemberProjectSubitemExcel {
    @NotBlank(message = "需要发票不能为空")
    private String needInvoice;

-    /**预计到账日期*/
+    /**预估到账日期*/
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "预计到账日期")
-    @Excel(name = "预计到账日期", width = 15,orderNum = "5")
+    @ApiModelProperty(value = "预估到账日期")
+    @Excel(name = "预估到账日期", width = 15,orderNum = "5")
    private String estimatedArrivalDate;

    @Excel(name = "邮寄联系人手机号", width = 17, orderNum = "4")