From 1e1ca98469294cd1bbe4c6deb8ba5a4415273be6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:52:02 +0800
Subject: [PATCH] .iml文件删除
---
screen-api/src/main/java/com/moral/api/entity/UserLog.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/UserLog.java b/screen-api/src/main/java/com/moral/api/entity/UserLog.java
index 3a34664..416fef5 100644
--- a/screen-api/src/main/java/com/moral/api/entity/UserLog.java
+++ b/screen-api/src/main/java/com/moral/api/entity/UserLog.java
@@ -3,8 +3,11 @@
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 java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +17,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-13
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,6 +30,11 @@
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+
+ /**
+ * ������������
+ */
+ private String type;
/**
* ������������
@@ -51,7 +59,8 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
@Override
--
Gitblit v1.8.0