From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-api/src/main/java/com/moral/api/entity/User.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 e0d33e1..ebc1066 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
@@ -4,14 +4,20 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
import java.util.Set;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.persistence.Transient;
/**
@@ -47,6 +53,7 @@
/**
* ������
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String password;
/**
@@ -77,16 +84,19 @@
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expireTime;
/**
--
Gitblit v1.8.0