Merge branch 'task-lyh-inctype2' into test

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

@@ -310,7 +310,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
                 space += sceneSpace;
                 lockedIds.add(scenePro.getId());
-                if (space > beyondSpace){
+                if (space >= beyondSpace){
                     break;
                 }
             }