Merge branch 'task-lyh-inctype2' into test

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

@@ -189,7 +189,7 @@ public class AppCameraService {
             ScenePro scenePro = sceneProService.getByUnicode(unicode);
             ScenePlusExt scenePlusExt = scenePlusExtService.getByUnicode(unicode);
             if(scenePro != null || scenePlusExt !=null){
-                sapce -=1;
+                return new AppCameraSpace(1L,cameraDetail.getUnit());
             }
         }
         Long totalSpace = cameraDetailService.getTotalSpaceByCameraId(cameraDetail);