From 4784ba9b5fe0d2c9ada694834ac6b0d0b7474b89 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 12 Aug 2021 15:52:23 +0800
Subject: [PATCH] special_device、special_device_history相关文件，special_device查询接口
---
screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java b/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java
index bc18ca5..30706e1 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -60,17 +61,20 @@
/**
* ������
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
private String wechat;
/**
* ������������
*/
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",locale = "zh",timezone="GMT+8")
private Date createTime;
/**
* ������������
*/
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",locale = "zh",timezone="GMT+8")
private Date updateTime;
/**
@@ -78,10 +82,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0