Merge branch 'project-jmga-2.2.0' into project-jmga-dev

src/main/java/com/fdkankan/contro/mq/listener/UploadSceneListener.java

@@ -245,7 +245,7 @@ public class UploadSceneListener {
         String ossKey = String.format(UploadFilePath.USER_VIEW_PATH,num) + "surveillance.json";
         if(fYunFileService.fileExist(ossKey)){
             String str = fYunFileService.getFileContent(ossKey);
-            List<Surveillance> list = JSON.parseObject(str, List.class);
+            List<Surveillance> list = JSON.parseArray(str, Surveillance.class);
             if(CollUtil.isNotEmpty(list)){
                 list.stream().forEach(v->{
                     v.setId(null);