Merge remote-tracking branch 'origin/master' into master

@@ -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>

@@ -39,8 +39,8 @@ public class CodeGenerator {
         DataSourceConfig dsc = new DataSourceConfig();
         DataSourceConfig dsc = new DataSourceConfig();
         dsc.setUrl("jdbc:oracle:thin:@192.168.2.218:1521:orcl");
         dsc.setUrl("jdbc:oracle:thin:@192.168.2.218:1521:orcl");
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
         dsc.setDriverName("oracle.jdbc.driver.OracleDriver");
-        dsc.setUsername("dangan1");
-        dsc.setPassword("dangan1");
+        dsc.setUsername("bdcdangan");
+        dsc.setPassword("bdcdangan");
         dsc.setDbType(DbType.ORACLE);
         dsc.setDbType(DbType.ORACLE);
         mpg.setDataSource(dsc);
         mpg.setDataSource(dsc);
         //3、包的配置
         //3、包的配置

@@ -24,7 +24,6 @@ import java.util.Map;
 @RequestMapping("/SysDict")
 @RequestMapping("/SysDict")
 public class SysDictController {
 public class SysDictController {
 
 
-
     @Autowired
     @Autowired
     SysDictService sysDictService;
     SysDictService sysDictService;
 
 

@@ -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;

@@ -4,7 +4,6 @@ package com.pashanhoo.file.controller;
 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogWithFileVO;
 import com.pashanhoo.catalog.entity.vo.DgArchivesCatalogWithFileVO;
 import com.pashanhoo.common.Result;
 import com.pashanhoo.common.Result;
 import com.pashanhoo.file.entity.vo.AddDgFileRequest;
 import com.pashanhoo.file.entity.vo.AddDgFileRequest;
-import com.pashanhoo.file.entity.vo.DgFileListVO;
 import com.pashanhoo.file.entity.vo.UpdateDgFileRequest;
 import com.pashanhoo.file.entity.vo.UpdateDgFileRequest;
 import com.pashanhoo.file.entity.vo.DgFileSearchRequest;
 import com.pashanhoo.file.entity.vo.DgFileSearchRequest;
 import com.pashanhoo.file.service.DgFileService;
 import com.pashanhoo.file.service.DgFileService;

@@ -19,8 +19,8 @@ spring:
     default-property-inclusion: non_null
     default-property-inclusion: non_null
   datasource:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    username: dangan1
-    password: dangan1
+    username: bdcdangan
+    password: bdcdangan
     url: jdbc:oracle:thin:@192.168.2.218:1521:orcl
     url: jdbc:oracle:thin:@192.168.2.218:1521:orcl
 
 
 mybatis-plus:
 mybatis-plus: