From a4873b9c82a633d839d51821a0e74c3d7c70cb9a Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Tue, 27 Jun 2023 16:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90dict=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E5=85=B8=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/dict/modular/entity/SysDict.java   | 24 +++++++++----------
 .../dict/modular/entity/SysDictType.java      |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java
index 7ad6e5770..55b86afa3 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDict.java
@@ -24,9 +24,12 @@
  */
 package cn.stylefeng.roses.kernel.dict.modular.entity;
 
-import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseBusinessEntity;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,9 +42,9 @@ import java.math.BigDecimal;
  * @since 2020/12/26 22:37
  */
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_dict")
+@TableName(value = "sys_dict", autoResultMap = true)
 @Data
-public class SysDict extends BaseEntity {
+public class SysDict extends BaseBusinessEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -129,23 +132,18 @@ public class SysDict extends BaseEntity {
     @ChineseDescription("排序")
     private BigDecimal dictSort;
 
-    /**
-     * 是否删除，Y-被删除，N-未删除
-     */
-    @TableField(value = "del_flag", fill = FieldFill.INSERT)
-    @ChineseDescription("是否删除，Y-被删除，N-未删除")
-    private String delFlag;
-
     /**
      * 字典类型的名称
      */
+    @TableField(exist = false)
     @ChineseDescription("字典类型的名称")
-    private transient String dictTypeName;
+    private String dictTypeName;
 
     /**
      * 字典上级的名称（字典有上下级，字典类型没有上下级）
      */
+    @TableField(exist = false)
     @ChineseDescription("字典上级的名称（字典有上下级，字典类型没有上下级）")
-    private transient String parentName;
+    private String parentName;
 
 }
diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java
index 360223715..c178a672f 100644
--- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java
+++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/entity/SysDictType.java
@@ -43,7 +43,7 @@ import java.math.BigDecimal;
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-@TableName("sys_dict_type")
+@TableName(value = "sys_dict_type", autoResultMap = true)
 public class SysDictType extends BaseBusinessEntity {
 
     /**