From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/system/entity/User.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 53 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 b8a6c9d..94138e8 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;
/**
* 性别
@@ -153,7 +157,7 @@
private String hold;
-
+ private Integer status;
/**
* 行政区域id
*/
@@ -163,6 +167,54 @@
*/
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;
+
+ /**
+ * 是否报名考试 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;
+
}
--
Gitblit v1.9.3