From 4ecf2dbe2c255c3b556ff4bfb49b4e2e8285bd17 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 11:24:45 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/system/entity/User.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 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 72307b8..35f5dc6 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -16,10 +16,14 @@
  */
 package org.springblade.modules.system.entity;
 
+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;
 
@@ -74,6 +78,8 @@
 	/**
 	 * 生日
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;
 	/**
 	 * 性别
@@ -94,6 +100,96 @@
 	 * 身份证号
 	 */
 	private String cardid;
+	/**
+	 * 籍贯
+	 */
+	@ApiModelProperty(value = "籍贯")
+	@TableField("nativePlace")
+	private String nativeplace;
+	/**
+	 * 民族
+	 */
+	@ApiModelProperty(value = "民族")
+	private String nation;
+	/**
+	 * 学历
+	 */
+	@ApiModelProperty(value = "学历")
+	private String education;
+	/**
+	 * 政治面貌
+	 */
+	@ApiModelProperty(value = "政治面貌")
+	private String politicaloutlook;
+	/**
+	 * 身高
+	 */
+	@ApiModelProperty(value = "身高")
+	private Float height;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private String cell;
+	/**
+	 * 邮箱
+	 */
+	@ApiModelProperty(value = "邮箱")
+	private String emails;
+	/**
+	 * 联系地址
+	 */
+	@ApiModelProperty(value = "联系地址")
+	private String address;
+	/**
+	 * 户口所在地
+	 */
+	@ApiModelProperty(value = "户口所在地")
+	private String registered ;
+	/**
+	 * 入职时间
+	 */
+	@ApiModelProperty(value = "入职时间")
+	private String rtime;
+	private String hold;
+	private String jurisdiction;
+	private String securitynumber;
+
+	@TableField("examination_type")
+	private String examinationType;
+
+	@TableField("examination_mx")
+	private String examinationMx;
+	private String fingerprint;
+	private String photo;
+	/**
+	 * 是否派遣
+	 */
+	private String dispatch;
+
+	/**
+	 * 个人照片，电子照，用于展示保安证，准考证用
+	 */
+	@TableField("my_picture")
+	private String myPicture;
+	/**
+	 * 是否缴社保
+	 */
+	private String soil;
+
+
+	/**
+	 * 健康状态  0：健康 1：良好 2：一般 3：较差
+	 */
+	private String healstats;
+
+	/**
+	 * 发证日期（保安证）
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField("paper_time")
+	private Date paperTime;
 
 
 }

--
Gitblit v1.9.3