From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/system/entity/User.java | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index aa79951..251a126 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -128,7 +128,7 @@
* 身高
*/
@ApiModelProperty(value = "身高")
- private Float height;
+ private String height;
/**
* 联系电话
*/
@@ -153,11 +153,13 @@
* 入职时间
*/
@ApiModelProperty(value = "入职时间")
- private String rtime;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date rtime;
private String hold;
-
+ private Integer status;
/**
* 行政区域id
*/
@@ -189,6 +191,70 @@
* 是否采集照片
*/
private String photo;
+
+ /**
+ * 是否派遣
+ */
private String dispatch;
+ /**
+ * 个人照片，电子照，用于展示保安证，准考证用
+ */
+ @TableField("my_picture")
+ private String myPicture;
+
+ /**
+ * 是否报名考试 1：是 2：否
+ */
+ @TableField("is_apply")
+ private Integer isApply;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date birthtime;
+
+ /**
+ * 是否报名培训 1：是 2：否
+ */
+ @TableField("is_train")
+ private Integer isTrain;
+ /**
+ * 健康状态 0：健康 1：良好 2：一般 3：较差
+ */
+ private String healstats;
+ private String soil;
+
+ /**
+ * 发证日期（保安证）
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @TableField("paper_time")
+ private Date paperTime;
+
+ /**
+ * 离职原因
+ */
+ @TableField("reason_for_leav")
+ private String reasonForLeav;
+
+ private String holdv;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date holdvtime;
+
+ /**
+ * 是否缴纳保险 0：是 1：否
+ */
+ private Integer insurance;
+
+ /**
+ * 审查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("audit_time")
+ private Date auditTime;
+
}
--
Gitblit v1.9.3