diff --git a/pom.xml b/pom.xml
index c63fed58314d590f4469c597961c131447774d59..4304783ae31a367440d6dc381653458c4dcf6a03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,17 +47,29 @@
             <artifactId>spring-boot-starter-tomcat</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>-->
+
+
+        <!--postgresql-->
+<!--        <dependency>-->
+<!--            <groupId>org.postgresql</groupId>-->
+<!--            <artifactId>postgresql</artifactId>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.generator</groupId>
+            <artifactId>mybatis-generator-maven-plugin</artifactId>
+            <version>1.3.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.18</version>
+        </dependency>
 
 
 
@@ -71,6 +83,7 @@
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
         </dependency>
+
       <!--  <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -203,6 +216,12 @@
             <version>3.1.12</version>
         </dependency>
         <!--swagger end-->
+
+
+
+
+
+
     </dependencies>
 
     <!--<dependencyManagement>
diff --git a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
index 5c36248c0c9d7b668ce271263bf92c3b1ae16213..a21d66ae2e737529c078698fe95edc732a79dce2 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/FileSubmitController.java
@@ -37,7 +37,7 @@ import java.util.List;
 import java.util.Map;
 
 
-@Component
+
 @RestController
 @RequestMapping("/rest/import/")
 public class FileSubmitController {
@@ -132,7 +132,8 @@ public class FileSubmitController {
             Integer id = ids.get(i);
             dataSubmit = dataSubmitService.queryById(id);
             if (dataSubmitService.rejectSubmit(dataSubmit) > 0) {
-                String delFile = dataSubmit.getPath() + File.separator + dataSubmit.getTitle();
+//                String delFile = dataSubmit.getPath() + File.separator + dataSubmit.getTitle();
+                String delFile = dataSubmit.getPath() ;
                 System.out.println(delFile);
                 FileUtil.deleteDir(delFile);
                 sum = sum + 1;
@@ -174,7 +175,7 @@ public class FileSubmitController {
             dataFile.setFileSecurity(dataSubmit.getPlevel().toString());
             dataFile.setApprover(dataSubmit.getApprover());
             dataFile.setSubmitor(dataSubmit.getSubmitor());
-            dataFile.setFileType(dataSubmit.getTitle().substring(dataSubmit.getTitle().lastIndexOf(".") + 1));
+            dataFile.setFileType(dataSubmit.getFileType());
             if (i != 0) {
                 dataFile.setId(dataFile.getId() + i);
             }
@@ -230,6 +231,7 @@ public class FileSubmitController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "记录id号(不传参)", paramType = "body", dataType = "Integer", required = false),
             @ApiImplicitParam(name = "subtype", value = "提交类型", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", dataType = "String", defaultValue = ""),
             @ApiImplicitParam(name = "plevel", value = "文件等级", paramType = "body", dataType = "Integer", defaultValue = ""),
             @ApiImplicitParam(name = "status", value = "文件状态", paramType = "body", dataType = "Integer", defaultValue = ""),
             @ApiImplicitParam(name = "submitor", value = "提交者", paramType = "body", dataType = "String", defaultValue = ""),
@@ -245,9 +247,8 @@ public class FileSubmitController {
     @PostMapping("/sub")
     public ResponseResult DataSub(@RequestBody DataSubmit dataSubmit) {
         String userId=dataSubmit.getUserId();
-        userId="1";
         String upCachePath=upLoadPath+"_user"+userId;
-        System.out.println(dataSubmit);
+        System.out.println("文件类型"+dataSubmit.getFileType());
         String fileName = null;
         Integer count = 0;
         dataSubmit.setSubtype("1");
@@ -258,8 +259,8 @@ public class FileSubmitController {
         }
         DataSubmit dataSubmit_new = dataSubmit;
         DataSubmit dataSubmit_new2 = dataSubmit;
-        String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
-        dataSubmit.setPath(path);
+        String path_move = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl();
+//        dataSubmit.setPath(path);
         File baseFile = new File(upCachePath);
         File[] files = baseFile.listFiles();
         File file = null;
@@ -277,6 +278,8 @@ public class FileSubmitController {
                 dataSubmit.setFileNumbers(1);
             }
             dataSubmit.setTitle(fileName);
+            String path = dataMenuService.queryById(dataSubmit.getMenuid()).getUrl()+File.separator+fileName;
+            dataSubmit.setPath(path);
             dataSubmit.setSubtime(new Date());
             dataSubmit_new = dataSubmit;
             if (dataSubmitService.insertDataSubmit(dataSubmit_new) >= 0) {
@@ -287,7 +290,7 @@ public class FileSubmitController {
             dataSubmit_new.setId(dataSubmit_new2.getId());
         }
 
-        if (FileUtil.copyFolder(upCachePath, path) && count == files.length) {
+        if (FileUtil.copyFolder(upCachePath, path_move) && count == files.length) {
             FileUtil.deleteDir(upCachePath);
             return ResponseResult.success("表单信息提交成功！");
         }
@@ -309,7 +312,6 @@ public class FileSubmitController {
     })
     public ResponseResult uploadFile(@ApiParam(value = "二进制文件流")  MultipartFile[] file,String userId) {
 //        String filepath = "/root/upLoad";
-        userId="1";
         String upCachePath=upLoadPath+"_user"+userId;
         String filepath = upCachePath;
         String result = FileUtil.uploadFile(file, filepath);
@@ -361,4 +363,61 @@ public class FileSubmitController {
     }
 
 
+    /**
+     * 提交数据
+     //     * @param dataSubmit 数据信息
+     * @return 返回提交结果
+     * */
+    @ApiOperation(value = "修改数据", notes = "id不传参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "文件file的id", paramType = "body", dataType = "Integer", required = false),
+            @ApiImplicitParam(name = "fileType", value = "文件类型", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "plevel", value = "文件等级", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "oldmenuid", value = "原编目号", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "menuid", value = "编目号", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "menuName", value = "编目名称", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "year", value = "年份", paramType = "body", dataType = "Integer", defaultValue = ""),
+            @ApiImplicitParam(name = "title", value = "标题", paramType = "body", dataType = "String", defaultValue = ""),
+            @ApiImplicitParam(name = "area", value = "区域", paramType = "body", dataType = "String", defaultValue = ""),
+//            @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", dataType = "Integer"),
+    })
+    @PostMapping("/update")
+    public ResponseResult DataUpdate(@RequestBody Map<String, Object> map) {
+        Long id = (Long)map.get("id");
+        DataFile dataFile = dataFileService.queryById(id);
+        if((String)map.get("title")!=null){
+            dataFile.setFileName((String)map.get("title"));
+        }
+        if((Integer)map.get("year")!=null){
+            dataFile.setFileYear((Integer)map.get("year"));
+        }
+        if((String)map.get("area")!=null){
+            dataFile.setRegion((String)map.get("area"));
+        }
+        if((String)map.get("fileType")!=null){
+            dataFile.setFileType((String)map.get("fileType"));
+        }
+        if((String)map.get("plevel")!=null){
+            dataFile.setFileSecurity((String)map.get("plevel"));
+        }
+        if((Long)map.get("menuid")!=null){
+            String old_menuPath = dataMenuService.queryById((Long)map.get("oldmenuid")).getUrl();
+            String new_menuPath = dataMenuService.queryById((Long)map.get("menuid")).getUrl();
+            if(FileUtil.copyFolder(dataFileService.queryById(id).getFilePath(),new_menuPath)){
+                dataFile.setFilePath(dataFile.getFilePath().replace(old_menuPath,new_menuPath));
+            }
+
+
+
+
+        }
+
+
+
+
+
+        return ResponseResult.error("表单信息提交失败！");
+}
+
+
 }
diff --git a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
index 1d6c95cbfac28900a304e854ce73ee28316ee7ce..6250e2c74d829479ab7913b8fdc4643c9b3f2c6d 100644
--- a/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
+++ b/src/main/java/com/cetc32/dh/controller/rest/VfileMenuController.java
@@ -305,6 +305,7 @@ public class VfileMenuController {
     })
     @GetMapping("/downloadMulFile")
     public String downloadMulFile(String[] fileIds, HttpServletResponse response) {
+//        System.out.println(fileIds.length+"xxxxxxxxx");
 
         if (fileIds.length == 1) {
             Long fileId = Long.parseLong(fileIds[0]);
@@ -334,16 +335,19 @@ public class VfileMenuController {
         for(int i=0;i<fileIds.length;i++){
             fileId = Long.parseLong(fileIds[i]);
             if(dataFileService.queryById(fileId)!=null){
-                fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
+                fileName = dataFileService.queryById(fileId).getFilePath();
+//                fileName = dataFileService.queryById(fileId).getFilePath() + File.separator + dataFileService.queryById(fileId).getFileName();
                 if (FileUtil.isDirectory(fileName)) {
                     List<String> stringList = FileUtil.getAllFile(fileName);
                     for (int j = 0; j < stringList.size(); j++) {
                         fileNames.add(stringList.get(j));
-                        filePaths.add(dataFileService.queryById(fileId).getFilePath());
+                        filePaths.add(fileName.substring(0,fileName.lastIndexOf("/")));
+//                        filePaths.add(dataFileService.queryById(fileId).getFilePath());
                     }
                 } else {
                     fileNames.add(fileName);
-                    filePaths.add(dataFileService.queryById(fileId).getFilePath());
+                    filePaths.add(fileName.substring(0,fileName.lastIndexOf("/")));
+//                    filePaths.add(dataFileService.queryById(fileId).getFilePath());
                 }
             }
         }
diff --git a/src/main/java/com/cetc32/dh/entity/DataSubmit.java b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
index 5a3abd617936139bc333de0aad79038f4c699548..b173508b72fcd7b53d52cbc2bfa8e51f0a89954f 100644
--- a/src/main/java/com/cetc32/dh/entity/DataSubmit.java
+++ b/src/main/java/com/cetc32/dh/entity/DataSubmit.java
@@ -9,7 +9,7 @@ public class DataSubmit extends NumberS{
     public DataSubmit(){}
 
     public DataSubmit(Integer id, String subtype, Integer plevel, Integer status, String submitor, String approver,
-                      Long menuid, String menuName, Integer year, String title, String area, String path) {
+                      Long menuid, String menuName, Integer year, String title, String area, String path,String fileType) {
         this.id=id;
         this.subtype=subtype;
         this.plevel=plevel;
@@ -22,6 +22,7 @@ public class DataSubmit extends NumberS{
         this.area=area;
         this.path=path;
         this.menuName=menuName;
+        this.fileType=fileType;
 
     }
 
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a7ec0c2e660fe4768231fa9df98e5b1767feb979..a7b163a4d69c562b2d3d001be450823f7b0e7890 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -23,15 +23,21 @@ spring:
   application:
     name: dhManager
   datasource:
-    url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
-    username: root
-    password: 123
-    #    initial-size: 1
-    #    min-idle: 1
-    #    max-active: 20
-    #    test-on-borrow: true
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.zaxxer.hikari.HikariDataSource
+    url: jdbc:postgresql://192.168.1.60:5432/dhmanage
+    username: postgres
+    password: 123456
+  driver-class-name: org.postgresql.Driver
+
+#  datasource:
+#    url: jdbc:mysql://localhost:3306/dhmanage?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8
+#    username: root
+#    password: 123
+#        initial-size: 1
+#        min-idle: 1
+#        max-active: 20
+#        test-on-borrow: true
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    type: com.zaxxer.hikari.HikariDataSource
 
   servlet:
     multipart:
diff --git a/src/main/resources/generator.xml b/src/main/resources/generator.xml
index 034fccebf7e012dd8a930d410a46ced92e6c3d88..9165c04cfdaa03f403ac6dd79ed7e34edb61fa6e 100644
--- a/src/main/resources/generator.xml
+++ b/src/main/resources/generator.xml
@@ -4,12 +4,10 @@
         "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 
 <generatorConfiguration>
-
     <properties resource="jdbc.properties" />
-    <classPathEntry location="/root/IdeaProjects/dh_data_mng/src/main/resources/mysql-connector-java-8.0.21.jar"/>
-
-    <!-- MyBatis3Simple：不生成 Example相关类及方法 defaultModelType="flat" -->
-    <context id="MysqlContext" targetRuntime="MyBatis3Simple" >
+    <!--数据库驱动-->
+    <classPathEntry location="/root/IdeaProjects/dh_data_mng/src/main/resources/postgresql-42.2.18.jar"/>
+    <context id="postgresqlContext" targetRuntime="MyBatis3Simple">
 
         <property name="beginningDelimiter" value="`"/>
         <property name="endingDelimiter" value="`"/>
@@ -19,6 +17,7 @@
             <property name="mappers" value="${generator.mappers}"/>
         </plugin>
 
+
         <!--注意context内的文件要按序放-->
         <commentGenerator>
             <property name="suppressDate" value="true"/>
@@ -26,12 +25,12 @@
             <property name="suppressAllComments" value="true"/>
         </commentGenerator>
 
+        <!--数据库链接地址账号密码-->
+        <jdbcConnection driverClass="org.postgresql.Driver"
+                        connectionURL="jdbc:postgresql://192.168.1.211:5432/dhmanage"
+                        userId="postgres"
+                        password="123456">
 
-        <!-- jdbc 连接配置 -->
-        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                        connectionURL="${spring.datasource.url}"
-                        userId="${spring.datasource.username}"
-                        password="${spring.datasource.password}">
         </jdbcConnection>
 
         <javaTypeResolver>
@@ -39,22 +38,24 @@
             <property name="forceBigDecimals" value="false"/>
         </javaTypeResolver>
 
-        <!-- 生成实体类的包名和位置 ，targetPackage指的是包名,targetProject值得是路径位置-->
-        <!-- 对于生成的pojo所在包,pojo其实就是domain Entity-->
+        <!--生成Model、pojo类存放位置-->
         <javaModelGenerator targetPackage="${generator.javaModel-targetPackage}" targetProject="${generator.targetProject}">
             <property name="enableSubPackages" value="true"/>
             <property name="trimStrings" value="true"/>
         </javaModelGenerator>
 
-        <!-- 对于生成的mapper.xml所在目录 -->
-        <sqlMapGenerator targetPackage="${generator.sqlMap-targetPackage}" targetProject="src/main/resources"/>
+        <!--生成映射文件存放位置-->
+        <sqlMapGenerator targetPackage="${generator.sqlMap-targetPackage}" targetProject="src/main/resources">
+<!--            <property name="enableSubPackages" value="true"/>-->
+        </sqlMapGenerator>
 
-        <!-- 配置mapper对应的java映射  也可以叫dao层 -->
-        <javaClientGenerator targetPackage="${generator.javaClient-targetPackage}" targetProject="${generator.targetProject}"
-                             type="XMLMAPPER"/>
+        <!--生成Dao类存放位置-->
+        <javaClientGenerator type="XMLMAPPER" targetPackage="${generator.javaClient-targetPackage}" targetProject="${generator.targetProject}">
+<!--            <property name="enableSubPackages" value="true"/>-->
+        </javaClientGenerator>
 
-        <!-- table可以有多个,每个数据库中的表都可以写一个table，tableName表示要匹配的数据库表,也可以在tableName属性中通过使用%通配符来匹配所有数据库表,只有匹配的表才会自动生成文件 -->
-        <table tableName="data_submit"></table>
+        <!--生成对应表及类名-->
+        <table tableName="xiao_test"></table>
         <table schema="EstimateTask"  tableName="estimate_task"
                enableSelectByPrimaryKey="true"
                enableUpdateByPrimaryKey="true"
diff --git a/src/main/resources/generator_mysql.xml b/src/main/resources/generator_mysql.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4dd8d0fb5765826c3247c1acf0836def00ff8c4e
--- /dev/null
+++ b/src/main/resources/generator_mysql.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+
+<generatorConfiguration>
+
+    <properties resource="jdbc.properties" />
+    <classPathEntry location="/root/IdeaProjects/dh_data_mng/src/main/resources/mysql-connector-java-8.0.21.jar"/>
+
+    <!-- MyBatis3Simple：不生成 Example相关类及方法 defaultModelType="flat" -->
+<!--    targetRuntime="MyBatis3Simple"-->
+    <context id="MysqlContext" targetRuntime="MyBatis3Simple" >
+
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+
+        <!-- 指定生成 Mapper 的继承模板 -->
+        <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
+            <property name="mappers" value="${generator.mappers}"/>
+        </plugin>
+
+        <!--注意context内的文件要按序放-->
+        <commentGenerator>
+            <property name="suppressDate" value="true"/>
+            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
+            <property name="suppressAllComments" value="true"/>
+        </commentGenerator>
+
+
+        <!-- jdbc 连接配置 -->
+        <jdbcConnection driverClass="com.mysql.jdbc.Driver"
+                        connectionURL="${spring.datasource.url}"
+                        userId="${spring.datasource.username}"
+                        password="${spring.datasource.password}">
+        </jdbcConnection>
+
+        <javaTypeResolver>
+            <!-- 是否使用bigDecimal， false可自动转化以下类型（Long, Integer, Short, etc.） -->
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+
+        <!-- 生成实体类的包名和位置 ，targetPackage指的是包名,targetProject值得是路径位置-->
+        <!-- 对于生成的pojo所在包,pojo其实就是domain Entity-->
+        <javaModelGenerator targetPackage="${generator.javaModel-targetPackage}" targetProject="${generator.targetProject}">
+            <property name="enableSubPackages" value="true"/>
+            <property name="trimStrings" value="true"/>
+        </javaModelGenerator>
+
+        <!-- 对于生成的mapper.xml所在目录 -->
+        <sqlMapGenerator targetPackage="${generator.sqlMap-targetPackage}" targetProject="src/main/resources"/>
+
+        <!-- 配置mapper对应的java映射  也可以叫dao层 -->
+        <javaClientGenerator targetPackage="${generator.javaClient-targetPackage}" targetProject="${generator.targetProject}"
+                             type="XMLMAPPER"/>
+
+        <!-- table可以有多个,每个数据库中的表都可以写一个table，tableName表示要匹配的数据库表,也可以在tableName属性中通过使用%通配符来匹配所有数据库表,只有匹配的表才会自动生成文件 -->
+        <table tableName="data_submit_two"></table>
+        <table schema="EstimateTask"  tableName="estimate_task"
+               enableSelectByPrimaryKey="true"
+               enableUpdateByPrimaryKey="true"
+               enableDeleteByPrimaryKey="true">
+        </table>
+
+    </context>
+</generatorConfiguration>
\ No newline at end of file
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index e791d854156f71c70303d78e504df503673e3aca..ee4bd87854edacba22baa855bdc42d5152c1a65b 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -1,8 +1,13 @@
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
-#spring.datasource.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=123
+#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dhmanage?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false
+##spring.datasource.driverClassName=com.mysql.jdbc.Driver
+#spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
+#spring.datasource.username=root
+#spring.datasource.password=123
+
+spring.datasource.url=jdbc:postgresql://192.168.1.60:5432/postgres
+spring.datasource.username=postgres
+spring.datasource.password=123456
+spring.datasource.driver-class-name=org.postgresql.Driver
 
 #Mybatis扫描
 mybatis.mapper-locations=classpath*:com/**/mapper/**.xml
diff --git a/src/main/resources/mapper/DataSubmitMapper.xml b/src/main/resources/mapper/DataSubmitMapper.xml
index 4257df8983c127831be3dcef7cd8a41e5b50c790..d7eeae7d4366da948bd6a30b2c01408563c11852 100644
--- a/src/main/resources/mapper/DataSubmitMapper.xml
+++ b/src/main/resources/mapper/DataSubmitMapper.xml
@@ -6,7 +6,7 @@
       WARNING - @mbg.generated
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="subtype" jdbcType="INTEGER" property="subtype" />
+    <result column="subtype" jdbcType="VARCHAR" property="subtype" />
     <result column="plevel" jdbcType="INTEGER" property="plevel" />
     <result column="status" jdbcType="INTEGER" property="status" />
     <result column="submitor" jdbcType="VARCHAR" property="submitor" />
diff --git a/src/main/resources/mapper/VfileMenuMapper.xml b/src/main/resources/mapper/VfileMenuMapper.xml
index 344cbc5888e3a02aa22314465a0675c2b54d7be5..3a6f3d6ef8915a86cf030ae940726b3366c1043e 100644
--- a/src/main/resources/mapper/VfileMenuMapper.xml
+++ b/src/main/resources/mapper/VfileMenuMapper.xml
@@ -85,9 +85,10 @@
                 and file_security = #{vfileMenu.fileSecurity}
             </if>
         </where>
-        limit #{offset}, #{limit}
-    </select>
 
+        LIMIT #{limit} OFFSET #{offset}
+    </select>
+<!--           LIMIT #{limit} OFFSET #{offset}-->
 
     <select id="countFilesByObj" resultType="java.lang.Integer" parameterType="com.cetc32.dh.entity.VfileMenu">
         select count(*) from vfile_menu
diff --git a/src/main/resources/postgresql-42.2.18.jar b/src/main/resources/postgresql-42.2.18.jar
new file mode 100644
index 0000000000000000000000000000000000000000..7a851472bd0454b183affa96fa5aba9f2c007f7b
Binary files /dev/null and b/src/main/resources/postgresql-42.2.18.jar differ