From ecf6fbd98b4fe652a5388ac9343f9f4a8185adaf Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 18 Feb 2022 15:35:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AE=A1=E7=90=86-=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/system/entity/SysDict.java   | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
index 69947b431..379114206 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
@@ -3,6 +3,7 @@ package com.jero.modules.system.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.jero.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -32,7 +33,7 @@ public class SysDict implements Serializable {
      */
     @TableId(type = IdType.ASSIGN_ID)
     private String id;
-    
+
     /**
      * [预留字段，暂时无用]
      * 字典类型,0 string,1 number类型,2 boolean
@@ -40,7 +41,7 @@ public class SysDict implements Serializable {
      * 默认为string类型
      */
     private Integer type;
-    
+
     /**
      * 字典名称
      */
@@ -87,18 +88,27 @@ public class SysDict implements Serializable {
      */
     private Date updateTime;
 
-    /**是否为标签内容-数据字典（1是 0否）*/
+    /**
+     * 是否为标签内容-数据字典（1是 0否）
+     */
     @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
     @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
     private java.lang.Integer isTagDict;
 
-    /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/
+    /**
+     * 是否是只读（2字段固定，内部可配1固定字段 0非固定字段）
+     */
     @Excel(name = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）", width = 15)
     @ApiModelProperty(value = "是否是只读（2字段固定，内部可配1固定字段 0非固定字段）")
     private java.lang.Integer isReadOnly;
 
-    /**表单控件类型*/
-    @Excel(name = "表单控件类型", width = 15)
-    @ApiModelProperty(value = "表单控件类型")
-    private java.lang.String fieldShowType;
+    /**
+     * 标签类型 1下拉选择 2树形结构
+     */
+    @Excel(name = "标签类型 1下拉选择 2树形结构", width = 15)
+    @ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
+    @Dict(dicCode = "attribute_type")
+    private java.lang.String attributeType;
 }
+
+