From 4ed3e280d7f3a391da6c8734203b4fdee9be51e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Mon, 29 Jul 2024 10:27:27 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"fix(BaseEntity):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BC=BA=E5=B0=91id=E5=B1=9E=E6=80=A7=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=8A=A5=E9=94=99"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 003e125bfb93b30e3049b8cb48c5f008037f5526.
---
 .../com/youlai/system/common/base/BaseEntity.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/youlai/system/common/base/BaseEntity.java b/src/main/java/com/youlai/system/common/base/BaseEntity.java
index 89320fd2..d6a89e8d 100644
--- a/src/main/java/com/youlai/system/common/base/BaseEntity.java
+++ b/src/main/java/com/youlai/system/common/base/BaseEntity.java
@@ -1,6 +1,8 @@
 package com.youlai.system.common.base;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
@@ -23,12 +25,6 @@ public class BaseEntity implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键ID
-     */
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
     /**
      * 创建时间
      */
@@ -45,4 +41,9 @@ public class BaseEntity implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    /**
+     * 逻辑删除标识 (0-未删除 1-已删除)
+     */
+    @TableLogic(value = "0", delval = "1")
+    private Integer isDeleted;
 }