From df878618a8882fc057a5863738df43e1fcd878ea Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 14 Sep 2022 08:48:06 +0800
Subject: [PATCH] 密码修改
---
src/main/java/org/springblade/modules/system/entity/User.java | 70 ++++++++++++++++++++++++++++++++++
1 files changed, 69 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 c1baa2a..02648db 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -19,9 +19,11 @@
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,7 +78,7 @@
/**
* 生日
*/
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthday;
/**
* 性别
@@ -100,4 +102,70 @@
private String work_status;
+ private String examination_type;
+
+ private String examination_mx;
+
+ /**
+ * 辖区id
+ */
+ @ApiModelProperty(value = "辖区id")
+ private String jurisdiction;
+
+ /**
+ * 行政区
+ */
+ @ApiModelProperty(value = "行政区")
+ private String district;
+
+ /**
+ * 审查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("audit_time")
+ private Date auditTime;
+
+ /**
+ * 身份证号
+ */
+ private String cardid;
+ /**
+ * 审核状态 0：待审核 1 ：审核通过
+ */
+ private String stype;
+
+ /**
+ * 居住地址
+ */
+ private String address;
+ /**
+ * 工作地点
+ */
+ private String workaddress;
+ /**
+ * 工作辖区
+ */
+ private String workjurisdiction;
+ private String signals;
+ @TableField("job_unit")
+ private String jobUnit;
+ private String firstlogin;
+ private String rolename;
+
+ /**
+ * 保安员id,关联保安系统
+ */
+ private String securityId;
+
+ /**
+ * 是否允许登录管理平台
+ */
+ private String isweb;
+ /**
+ * 所属队伍
+ */
+ private String team;
+
+
}
--
Gitblit v1.9.3