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")