From fd856e07505b48ba90d8a442cb9618076bc283bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 9 May 2022 14:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E8=81=8C=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/entity/datacollection/dto/AddUpSituationDTO.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
index d53f6676e..9febc5c53 100644
--- a/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
+++ b/src/com/engine/salary/entity/datacollection/dto/AddUpSituationDTO.java
@@ -13,7 +13,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 数据采集-累计情况表
@@ -73,7 +72,7 @@ public class AddUpSituationDTO {
     //入职日期
     @SalaryTableColumn(text = "入职日期", width = "10%", column = "hiredate")
     @ExcelProperty(index = 6)
-    private Date hiredate;
+    private String hiredate;
 
     //累计收入额
     @SalaryTableColumn(text = "累计收入额", width = "10%", column = "addUpIncome")