From e97177f932bc9ab48f7acddcbcd22e6ceb318bea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 Jan 2022 11:01:51 +0800
Subject: [PATCH] 1. 许可证信息新增 2. 工商表信息新增 3. 保安公司tree 接口修改 4. 管理人实体修改 5. 保安，公司相关接口修改
---
src/main/java/org/springblade/modules/system/entity/User.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 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 35f5dc6..bc7abef 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -125,7 +125,7 @@
* 身高
*/
@ApiModelProperty(value = "身高")
- private Float height;
+ private String height;
/**
* 联系电话
*/
@@ -150,6 +150,8 @@
* 入职时间
*/
@ApiModelProperty(value = "入职时间")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private String rtime;
private String hold;
private String jurisdiction;
@@ -191,5 +193,39 @@
@TableField("paper_time")
private Date paperTime;
+ /**
+ * 离职原因
+ */
+ @TableField("reason_for_leav")
+ private String reasonForLeav;
+
+
+ private String holdv;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date holdvtime;
+
+
+ /**
+ * 是否缴纳保险 0：是 1：否
+ */
+ private Integer insurance;
+ private String guncode;
+
+ /**
+ * 审查时间
+ */
+ @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;
+
+ /**
+ * 押运人员设备编号
+ */
+ @TableField("equipment_code")
+ private String equipmentCode;
+
}
--
Gitblit v1.9.3