From ebb42a6525201b6c5cc2f8de68ff9bf67504e4d3 Mon Sep 17 00:00:00 2001
From: Kris <2893855659@qq.com>
Date: Thu, 27 Mar 2025 09:59:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=B1=BB=EF=BC=8C=E4=BD=BF=E7=94=A8Lombok?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=EF=BC=8C=E5=90=8E=E7=BB=AD=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E7=B1=BB=E9=9B=86=E6=88=90=E8=AF=A5=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czsj/common/core/domain/BaseEntity.java   | 107 +++++-------------
 1 file changed, 27 insertions(+), 80 deletions(-)

diff --git a/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java b/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java
index 247cba5..8e24836 100644
--- a/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java
+++ b/czsj-common/src/main/java/com/czsj/common/core/domain/BaseEntity.java
@@ -2,17 +2,23 @@ package com.czsj.common.core.domain;
 
 import java.io.Serializable;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.czsj.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
 
 /**
  * Entity基类
  * 
  * @author czsj
  */
+@Data
 public class BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
@@ -21,19 +27,32 @@ public class BaseEntity implements Serializable
     @JsonIgnore
     private String searchValue;
 
-    /** 创建者 */
-    private String createBy;
+    /** 有效标识，0有效，1无效 */
+    @TableLogic(value = "0",delval = "1")
+    @Excel(name = "有效标识，0有效，1无效")
+    public Integer isDeleted;
+
+    /** 创建人ID */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "创建人ID")
+    public String createBy;
+
+    /** 修改人ID */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Excel(name = "修改人ID")
+    public String updateBy;
 
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /** 更新者 */
-    private String updateBy;
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "创建时间")
+    public Date createTime;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @Excel(name = "修改时间")
+    public Date updateTime;
 
     /** 备注 */
     private String remark;
@@ -42,77 +61,5 @@ public class BaseEntity implements Serializable
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
-    public String getSearchValue()
-    {
-        return searchValue;
-    }
 
-    public void setSearchValue(String searchValue)
-    {
-        this.searchValue = searchValue;
-    }
-
-    public String getCreateBy()
-    {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy)
-    {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime()
-    {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime)
-    {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy()
-    {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy)
-    {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime()
-    {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime)
-    {
-        this.updateTime = updateTime;
-    }
-
-    public String getRemark()
-    {
-        return remark;
-    }
-
-    public void setRemark(String remark)
-    {
-        this.remark = remark;
-    }
-
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
-    public void setParams(Map<String, Object> params)
-    {
-        this.params = params;
-    }
 }