From 4686da41b376617f6d447b3546c045ce54f032fa Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 10 Nov 2023 16:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/ManageLog.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java b/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java
index 7b60d15..4896edc 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageLog.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +16,7 @@
* </p>
*
* @author moral
- * @since 2021-03-09
+ * @since 2021-04-12
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -29,19 +31,30 @@
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������
@@ -51,12 +64,7 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0