From ec25027a0b82d2388d5cf7cd47cc4a3620b293a3 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 24 Jun 2021 11:56:40 +0800
Subject: [PATCH] 修改、删除因子是,对组织型号关系表进行修改、删除

---
 screen-api/src/main/java/com/moral/api/entity/User.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index 678ff19..cf22cd8 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -13,9 +13,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
-import javax.persistence.Transient;
-
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * <p>
@@ -93,7 +91,8 @@
     /**
      * ������������
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date expireTime;
 
     /**

--
Gitblit v1.8.0