Merge branch 'release-v4.14.0' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java
#	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/bean/SceneJsonBean.java

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

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

@@ -189,8 +189,6 @@ public class ScenePlusExt implements Serializable {
     @TableField("icon_size")
     private String iconSize;
 
-
-
-    @TableField("has_ai")
-    private Integer hasAi;
+    @TableField("has_recognition")
+    private Integer hasRecognition;
 }

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

@@ -252,7 +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());
+        sceneJson.setHasRecognition(scenePlusExt.getHasRecognition());
         if(StrUtil.isNotEmpty(scenePlusExt.getVideos())){
             sceneJson.setVideos(scenePlusExt.getVideos());
         }
@@ -511,7 +511,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());
+        sceneInfoVO.setHasRecognition(scenePlusExt.getHasRecognition());
 
         this.SortBoxVideos(sceneInfoVO);
 

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

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