Merge branch 'feature-bcgn' into test

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -130,9 +130,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
 
-        ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        scenePlusExt.setIconSize(param.getIconSize().toJSONString());
-        scenePlusExtService.updateById(scenePlusExt);
+        if(Objects.nonNull(param.getIconSize())){
+            ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+            scenePlusExt.setIconSize(param.getIconSize().toJSONString());
+            scenePlusExtService.updateById(scenePlusExt);
+        }
 
         SceneEditInfo sceneEditInfoDb = this.getByScenePlusId(scenePlus.getId());
         SceneEditControls sceneEditControlsDb = null;