From d6a0a1bb4c7b27a6521c969046cb969b168fa93a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Jun 2021 10:11:08 +0800
Subject: [PATCH] screen-manage 更新组织删除逻辑，存在站点或者子组织存在站点则无法删除。
---
screen-manage/src/main/java/com/moral/api/entity/ManageLog.java | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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..ade2ae0 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,7 +64,7 @@
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
@Override
--
Gitblit v1.8.0