From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +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/ManageLog.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/ManageLog.java b/screen-api/src/main/java/com/moral/api/entity/ManageLog.java
index a305e3f..516426e 100644
--- a/screen-api/src/main/java/com/moral/api/entity/ManageLog.java
+++ b/screen-api/src/main/java/com/moral/api/entity/ManageLog.java
@@ -3,8 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.time.LocalDateTime;
import java.io.Serializable;
-import java.util.Date;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -15,7 +16,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-13
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -30,19 +31,29 @@
private Integer id;
/**
+ * ������������id
+ */
+ private Integer accountId;
+
+ /**
+ * ������������������
+ */
+ private String account;
+
+ /**
+ * ������������
+ */
+ private String userName;
+
+ /**
+ * ������������
+ */
+ private String type;
+
+ /**
* ������������
*/
private String content;
-
- /**
- * ������Id
- */
- private Integer organizationId;
-
- /**
- * ������������id
- */
- private Integer operateId;
/**
* Ip������
@@ -52,7 +63,7 @@
/**
* ������������
*/
- private Date createTime;
+ private LocalDateTime createTime;
@Override
--
Gitblit v1.8.0