Merge branch 'release-v4.14.0' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/vo/SceneEditControlsParamVO.java
#	src/main/java/com/fdkankan/scene/vo/SceneEditControlsVO.java

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

@@ -193,5 +193,11 @@ public class SceneEditControls implements Serializable {
     @TableLogic(value = "A", delval = "I")
     private String recStatus;
 
+    /**
+     * 是否显示ai识别
+     */
+    @TableField("show_ai")
+    private Integer showAi;
+
 
 }

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

@@ -135,7 +135,6 @@ public class SceneEditControlsParamVO implements Serializable {
 
     private Integer showAreas;
 
-
-
+    private Integer showAi;
 
 }

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

@@ -125,5 +125,7 @@ public class SceneEditControlsVO implements Serializable {
 
     private Integer showAreas;
 
+    private Integer showAi;
+
 
 }