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

疯狂的狮子li

2021-07-21 1f2cf719da496e0210d35a1b040f6aa9745f390d

 ruoyi-oss/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java

@@ -59,7 +59,7 @@
      ICloudStorageService storage = OssFactory.instance();
      UploadResult uploadResult;
      try {
         uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
         uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
      } catch (IOException e) {
         throw new CustomException("文件读取异常!!!", e);
      }