From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/entity/UserLog.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/UserLog.java b/screen-manage/src/main/java/com/moral/api/entity/UserLog.java
index 58f4dca..226dbae 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/UserLog.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/UserLog.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.io.Serializable;
import java.util.Date;
@@ -57,12 +59,9 @@
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0