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

gongchunyi

7 天以前 b3712bb9c618d3cb74b6a200fd83c2ba0577ac3d

 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;

    }



    /**