From fd7b9aabefdcfa4e2f8504c77d5a4e6f4f955585 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 14:50:28 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/system/entity/User.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 892bde0..e79d1ca 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -18,10 +18,12 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -76,6 +78,8 @@
 	/**
 	 * 生日
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;
 	/**
 	 * 性别
@@ -150,8 +154,10 @@
 	private String hold;
 	private String jurisdiction;
 	private String securitynumber;
+
 	@TableField("examination_type")
 	private String examinationType;
+
 	@TableField("examination_mx")
 	private String examinationMx;
 	private String fingerprint;
@@ -166,6 +172,16 @@
 	 */
 	@TableField("my_picture")
 	private String myPicture;
+	/**
+	 * 是否缴社保
+	 */
+	private String soil;
+
+
+	/**
+	 * 健康状态  0:健康 1:良好 2:一般 3:较差
+	 */
+	private String healstats;
 
 
 }

--
Gitblit v1.9.3