Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-09-18 298fabfdecca5dccd20129a59090003daa00f44d

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

@@ -14,7 +14,7 @@
 * 
 * @author ruoyi
 */
public class FileUtils
public class FileUtils extends org.apache.commons.io.FileUtils
{
    public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";