Merge branch 'task-lyh-inctype2' into test

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

@@ -197,8 +197,8 @@ public class AppCameraService {
         }
         Long sapce = cameraDetail.getUsedSpace();
         if("SP".equals(cameraDetail.getUnit())){
-            Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId(),false);
-            Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId(), false);
+            Long proCount = sceneProService.getCountByCameraId(cameraDetail.getCameraId(),true);
+            Long pulsCount = scenePlusService.getCountByCameraId(cameraDetail.getCameraId(), true);
             sapce = proCount + pulsCount;
             if(StringUtils.isNotBlank(unicode)){
                 ScenePro scenePro = sceneProService.getByUnicode(unicode);