Merge branch 'release-v4.14.0' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java
#	src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java
#	src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

src/main/java/com/fdkankan/scene/entity/ScenePlusExt.java

@@ -190,4 +190,7 @@ public class ScenePlusExt implements Serializable {
     private String iconSize;
 
 
+
+    @TableField("has_ai")
+    private Integer hasAi;
 }

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

@@ -510,6 +510,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setStarted(JSON.parseObject(sceneEditInfoExt.getStarted()));
         sceneInfoVO.setOrientation(scenePlusExt.getOrientation());
         sceneInfoVO.setIconSize(JSON.parseObject(scenePlusExt.getIconSize()));
+        sceneInfoVO.setHasAi(scenePlusExt.getHasAi());
 
         this.SortBoxVideos(sceneInfoVO);
 

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -270,4 +270,6 @@ public class SceneInfoVO {
 
     private JSONObject iconSize;
 
+    private Integer hasAi;
+
 }