From 49875151be4b427935fcb3d60696e99ba9d2e1ad Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 01 Jul 2021 16:58:03 +0800
Subject: [PATCH] screen-manage 添加根据组织id和地区码获取设备接口
---
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