Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

2 天以前 c15e67c83394c1734eb4e9802d8f343c6076efc1

 src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

@@ -144,7 +144,8 @@
    {

        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;

        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);

        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;

//        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;

        return currentDir + "/" + fileName;

    }



    /**