Merge branch 'release-v4.14.0' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java
#	src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -242,5 +242,6 @@ public class SceneJsonBean {
 
     private JSONObject iconSize;
 
+    private Integer hasAi;
 
 }

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

@@ -252,6 +252,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneJson.setModelKind(scenePlusExt.getModelKind());
         sceneJson.setOrientation(scenePlusExt.getOrientation());
         sceneJson.setIconSize(JSON.parseObject(scenePlusExt.getIconSize()));
+        sceneJson.setHasAi(scenePlusExt.getHasAi());
         if(StrUtil.isNotEmpty(scenePlusExt.getVideos())){
             sceneJson.setVideos(scenePlusExt.getVideos());
         }