Merge branch 'test'

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -170,9 +170,6 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         if(cameraVersion == null){
             throw new BusinessException(ResultCode.CAMERA_VERSION_NOT_EXIST);
         }
-        if(param.getDescription().length() >255){
-            throw new BusinessException(ResultCode.CAMERA_VERSION_NOT_EXIST);
-        }
         if(StringUtils.isNotBlank(param.getStatus()) && !param.getStatus().equals(cameraVersion.getStatus())){
             if(StringUtils.isBlank(param.getStatus()) || param.getType() == null){
                 throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -142,7 +142,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(incrementType.getCameraCapacity() == -1){
                     totalSpace   = -1L;
                 }else {
-                    totalSpace = incrementType.getCameraCapacity() * 1024 * 1024L;
+                    totalSpace = incrementType.getCameraCapacity() * 1024* 1024 * 1024L;
                 }
             }
         }
@@ -348,7 +348,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(incrementType.getCameraCapacity() == -1){
                     totalSpace   = -1L;
                 }else {
-                    totalSpace = incrementType.getCameraCapacity() * 1024 * 1024L;
+                    totalSpace = incrementType.getCameraCapacity() * 1024 *1024 * 1024L;
                 }
             }
         }