From 8cce57fe5341aa159a8527fc391574fb03a90bde Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 3 Mar 2022 10:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/modules/system/entity/SysCategory.java  | 2 +-
 .../src/main/java/com/jero/modules/system/entity/SysDict.java  | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
index b5ccf688f..6e62a1240 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java
@@ -61,7 +61,7 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	@Excel(name = "数据字典id", width = 15)
 	@Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id")
 	@ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
-	private java.lang.String dictId;
+	private java.lang.String sysDictId;
 
 	/**是否有子节点*/
 	@Excel(name = "是否有子节点(1:有)", width = 15)
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 3cba02a4a..c30b861c7 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
@@ -91,8 +91,7 @@ public class SysDict implements Serializable {
     /**
      * 是否为标签内容-数据字典（1是 0否）
      */
-    @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)/*, dicText = "is_tag_dict", dicCode = "is_tag_dict")
-    @Dict(dictTable = "onl_cgform_field", dicText = "is_tag_dict", dicCode = "is_tag_dict")*/
+    @Excel(name = "是否为标签内容-数据字典（1是 0否）", width = 15)
     @ApiModelProperty(value = "是否为标签内容-数据字典（1是 0否）")
     private java.lang.Integer isTagDict;