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 | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 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 e2f6261..35f5dc6 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;
/**
* 性别
@@ -151,5 +155,41 @@
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