Merge branch 'test'

src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -335,7 +335,9 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
 
         List<ScenePro> sceneProList = sceneProService.getListByCameraIds(cameraIds);
         List<ScenePlus> scenePlusList = scenePlusService.getListByCameraIds(cameraIds);
-        //sceneCooperationService.deleteCooperationList(sceneProList,scenePlusList,Arrays.asList(user.getId()));
+        if(!"aws".equals(NacosProperty.uploadType)) {
+            sceneCooperationService.deleteCooperationList(sceneProList,scenePlusList,null);
+        }
 
         List<String> numList = new ArrayList<>();
         List<String> v3List = sceneProList.stream().map(ScenePro::getNum).collect(Collectors.toList());