字典字段添加.依赖冲突解决

@@ -249,6 +249,12 @@
             <artifactId>hutool-all</artifactId>
             <artifactId>hutool-all</artifactId>
             <version>5.6.0</version>
             <version>5.6.0</version>
         </dependency>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+            <version>1.4</version>
+        </dependency>
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

@@ -55,6 +55,12 @@ public class SysDict implements Serializable {
     @ApiModelProperty(value = "类型ID")
     @ApiModelProperty(value = "类型ID")
     private String typeId;
     private String typeId;
 
 
+    /**
+     * 状态（0:禁用 1:启用）默认1
+     */
+    @ApiModelProperty(value = "状态（0:禁用 1:启用）默认1")
+    private String state;
+
     private List<SysDict> children;
     private List<SysDict> children;
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

@@ -61,6 +61,12 @@ public class GetSysDictParentVo {
     @ApiModelProperty(value = "序号")
     @ApiModelProperty(value = "序号")
     private Integer rowNum;
     private Integer rowNum;
 
 
+    /**
+     * 状态（0:禁用 1:启用）默认1
+     */
+    @ApiModelProperty(value = "状态（0:禁用 1:启用）默认1")
+    private String state;
+
     private List<SysDict> children;
     private List<SysDict> children;
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;