From dacae5af651baa6ae102c8dd4350a7b8b7d86fe6 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 28 Apr 2022 16:16:40 +0800
Subject: [PATCH] 通过时间和mac集合查询数据接口，修改蜂窝图小时数据接口
---
screen-api/src/main/java/com/moral/api/entity/User.java | 12 +++---------
1 files changed, 3 insertions(+), 9 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..1ee5ef9 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;
/**
@@ -101,10 +100,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0