Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-common/src/main/java/com/dsk/common/utils/file/FileUtils.java

@@ -265,11 +265,11 @@ public class FileUtils
             for (File directory : files) {
                 // 如果是文件夹则递归调用此方法
                 if (directory.isDirectory()) {
-                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(directory.lastModified())));
+                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(directory.lastModified())));
                     getAllFiles(directory.getPath());
                 } else {
                     // 如果是文件则直接输出路径
-                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(directory.lastModified())));
+                    fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(directory.lastModified())));
                 }
             }
             return fileList;
@@ -301,7 +301,7 @@ public class FileUtils
                 tempFile = new File(path + File.separator + fileName);
             }
             if (tempFile.isFile()) {
-                fileList.add(new BusinessFileVo(tempFile.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(tempFile.lastModified())));
+                fileList.add(new BusinessFileVo(tempFile.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tempFile.lastModified())));
             }
             if (tempFile.isDirectory()) {
                 List<BusinessFileVo> allFiles = getAllFileNames(tempFile.getAbsolutePath());