|
@@ -4,6 +4,7 @@ import java.util.Date;
|
|
4
|
import java.util.List;
|
4
|
import java.util.List;
|
|
5
|
import javax.validation.constraints.*;
|
5
|
import javax.validation.constraints.*;
|
|
6
|
|
6
|
|
|
|
|
7
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
7
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
8
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
|
8
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
9
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
|
9
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
10
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
@@ -13,6 +14,7 @@ import com.sundot.airport.common.annotation.Excel.Type;
|
|
13
|
import com.sundot.airport.common.annotation.Excels;
|
14
|
import com.sundot.airport.common.annotation.Excels;
|
|
14
|
import com.sundot.airport.common.core.domain.BaseEntity;
|
15
|
import com.sundot.airport.common.core.domain.BaseEntity;
|
|
15
|
import com.sundot.airport.common.xss.Xss;
|
16
|
import com.sundot.airport.common.xss.Xss;
|
|
|
|
17
|
+import org.springframework.format.annotation.DateTimeFormat;
|
|
16
|
|
18
|
|
|
17
|
/**
|
19
|
/**
|
|
18
|
* 用户对象 sys_user
|
20
|
* 用户对象 sys_user
|
|
@@ -218,12 +220,16 @@ public class SysUser extends BaseEntity {
|
|
218
|
* 入职时间
|
220
|
* 入职时间
|
|
219
|
*/
|
221
|
*/
|
|
220
|
@Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM-dd")
|
222
|
@Excel(name = "入职时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
|
223
|
+ @JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
|
224
|
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
221
|
private Date entryDate;
|
225
|
private Date entryDate;
|
|
222
|
|
226
|
|
|
223
|
/**
|
227
|
/**
|
|
224
|
* X射线操作员开始时间
|
228
|
* X射线操作员开始时间
|
|
225
|
*/
|
229
|
*/
|
|
226
|
@Excel(name = "X射线操作员开始时间", width = 30, dateFormat = "yyyy-MM-dd")
|
230
|
@Excel(name = "X射线操作员开始时间", width = 30, dateFormat = "yyyy-MM-dd")
|
|
|
|
231
|
+ @JsonFormat(pattern = "yyyy-MM-dd")
|
|
|
|
232
|
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
|
|
227
|
private Date xrayOperatorStarttime;
|
233
|
private Date xrayOperatorStarttime;
|
|
228
|
|
234
|
|
|
229
|
/**
|
235
|
/**
|