From a65852d3e8a140f7c37897ba17acead4f77230e6 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 22 Oct 2024 18:31:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=20Dict=E3=80=81Role?=
 =?UTF-8?q?=20=E5=92=8C=20User=20=E7=B1=BB=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=20isDeleted=20=E5=AD=97=E6=AE=B5=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/youlai/boot/system/model/entity/Config.java     | 1 -
 src/main/java/com/youlai/boot/system/model/entity/Dept.java  | 3 +--
 src/main/java/com/youlai/boot/system/model/entity/Dict.java  | 5 +++++
 .../java/com/youlai/boot/system/model/entity/Notice.java     | 2 +-
 src/main/java/com/youlai/boot/system/model/entity/Role.java  | 5 +++++
 src/main/java/com/youlai/boot/system/model/entity/User.java  | 5 +++++
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/youlai/boot/system/model/entity/Config.java b/src/main/java/com/youlai/boot/system/model/entity/Config.java
index cf9f92c5..697556b8 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Config.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Config.java
@@ -51,7 +51,6 @@ public class Config extends BaseEntity {
     /**
      * 逻辑删除标识(0-未删除 1-已删除)
      */
-    @TableLogic(value = "0", delval = "1")
     private Integer isDeleted;
 
 }
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Dept.java b/src/main/java/com/youlai/boot/system/model/entity/Dept.java
index c59712be..cebe1f49 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Dept.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Dept.java
@@ -58,9 +58,8 @@ public class Dept extends BaseEntity {
     private Long updateBy;
 
     /**
-     * 逻辑删除标识(0-未删除 1-已删除)
+     * 是否删除(0-否 1-是)
      */
-    @TableLogic(value = "0", delval = "1")
     private Integer isDeleted;
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Dict.java b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
index adaeab48..fd8690c8 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Dict.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Dict.java
@@ -37,4 +37,9 @@ public class Dict extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 逻辑删除标识(0-未删除 1-已删除)
+     */
+    private Integer isDeleted;
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Notice.java b/src/main/java/com/youlai/boot/system/model/entity/Notice.java
index 5b71ad40..9bf675d2 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Notice.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Notice.java
@@ -79,9 +79,9 @@ public class Notice extends BaseEntity {
      * 更新人ID
      */
     private Long updateBy;
+
     /**
      * 逻辑删除标识(0-未删除 1-已删除)
      */
-    @TableLogic(value = "0", delval = "1")
     private Integer isDeleted;
 }
diff --git a/src/main/java/com/youlai/boot/system/model/entity/Role.java b/src/main/java/com/youlai/boot/system/model/entity/Role.java
index 724e5e35..0ca68116 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/Role.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/Role.java
@@ -50,4 +50,9 @@ public class Role extends BaseEntity {
      * 更新人 ID
      */
     private Long updateBy;
+
+    /**
+     * 是否删除(0-否 1-是)
+     */
+    private Integer isDeleted;
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/boot/system/model/entity/User.java b/src/main/java/com/youlai/boot/system/model/entity/User.java
index e617910e..62535380 100644
--- a/src/main/java/com/youlai/boot/system/model/entity/User.java
+++ b/src/main/java/com/youlai/boot/system/model/entity/User.java
@@ -67,4 +67,9 @@ public class User extends BaseEntity {
      * 更新人 ID
      */
     private Long updateBy;
+
+    /**
+     * 是否删除(0-否 1-是)
+     */
+    private Integer isDeleted;
 }
\ No newline at end of file