From 2ebca060a47784db76369a4aa84f63293da9be33 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 10:08:08 +0800
Subject: [PATCH] 保安员新增同步编号问题
---
src/main/java/org/springblade/modules/system/entity/User.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 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..cbfaca0 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,7 +150,11 @@
* 入职时间
*/
@ApiModelProperty(value = "入职时间")
- private String rtime;
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date rtime;
+
+
private String hold;
private String jurisdiction;
private String securitynumber;
@@ -191,5 +195,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