Commit 155396a5 authored by hongguangwu's avatar hongguangwu

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

parents 292fdad3 78eadea9
...@@ -27,8 +27,8 @@ import lombok.EqualsAndHashCode; ...@@ -27,8 +27,8 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
/** /**
* 项目档案表 * 项目档案表
...@@ -223,7 +223,7 @@ public class TEmployeeProject extends BaseEntity { ...@@ -223,7 +223,7 @@ public class TEmployeeProject extends BaseEntity {
* 入职日期 * 入职日期
*/ */
@Schema(description ="入职日期") @Schema(description ="入职日期")
private Date enjoinDate; private LocalDate enjoinDate;
/** /**
* 试用期(单位月) * 试用期(单位月)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment