Merge branch 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/TestController.java

@@ -35,7 +35,7 @@ public class TestController {
     public Result upload2aliyun(@RequestParam("fileName") String fileName) {
         try (final FileInputStream fis = new FileInputStream("/opt/upload_files/" + fileName)) {
             final MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fis);
-            return ossService.uploadImg(mockMultipartFile);
+            return ossService.uploadImg(mockMultipartFile, null);
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         } catch (IOException e) {