From f5d28298d0072bcf1fa2a7bb53c0aeef4b87a031 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 17 Sep 2021 09:40:23 +0800
Subject: [PATCH] 1.用户

---
 src/main/java/org/springblade/modules/system/entity/User.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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 eb71562..60e1f17 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 Integer height;
+	private String height;
 	/**
 	 * 联系电话
 	 */
@@ -231,5 +231,20 @@
 	@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;
 }

--
Gitblit v1.9.3