From e542a78c3be53518204dff0649bee46b7bb966af Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 26 Aug 2021 17:59:52 +0800
Subject: [PATCH] 从业记录查询修改，导入接口修改，年龄查询按身份证查

---
 src/main/java/org/springblade/modules/system/entity/User.java |    6 ++++--
 1 files changed, 4 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 865dbdb..eb71562 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -128,7 +128,7 @@
 	 * 身高
 	 */
 	@ApiModelProperty(value = "身高")
-	private Float height;
+	private Integer height;
 	/**
 	 * 联系电话
 	 */
@@ -153,7 +153,9 @@
 	 * 入职时间
 	 */
 	@ApiModelProperty(value = "入职时间")
-	private String rtime;
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date rtime;
 
 
 	private String hold;

--
Gitblit v1.9.3