From 169fd773b42398e14bef43c24a1b6712da51e95d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 01 Jun 2021 10:38:58 +0800
Subject: [PATCH] 日志操作判断更新字段是否为null
---
screen-manage/src/main/java/com/moral/api/entity/User.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/User.java b/screen-manage/src/main/java/com/moral/api/entity/User.java
index 9e744ab..15bf9e3 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/User.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/User.java
@@ -3,8 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -41,6 +45,7 @@
/**
* ������
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String password;
/**
@@ -71,17 +76,20 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
/**
* ������������
*/
- private LocalDateTime expireTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expireTime;
/**
* ������������
--
Gitblit v1.8.0