From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改,保安证编码生成修改

---
 src/main/java/org/springblade/modules/system/entity/User.java |   14 ++++++++++++--
 1 files changed, 12 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 7f7ed61..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;
@@ -222,4 +224,12 @@
 	private  String healstats;
 	private  String soil;
 
+	/**
+	 * 发证日期(保安证)
+	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@TableField("paper_time")
+	private Date paperTime;
+
 }

--
Gitblit v1.9.3