Merge branch 'release-floorplanai' into test

# Conflicts:
#	src/main/java/com/fdkankan/scene/entity/ScenePlus.java

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

@@ -130,4 +130,9 @@ public class ScenePlus implements Serializable {
      */
     @TableField("laser_title")
     private String laserTitle;
+
+    @TableField("has_floorplan_ai")
+    private Integer hasFloorplanAi;
+
+
 }

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

@@ -512,6 +512,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         sceneInfoVO.setOrientation(scenePlusExt.getOrientation());
         sceneInfoVO.setIconSize(JSON.parseObject(scenePlusExt.getIconSize()));
         sceneInfoVO.setHasRecognition(scenePlusExt.getHasRecognition());
+        sceneInfoVO.setHasFloorplanAi(scenePlus.getHasFloorplanAi());
 
         this.SortBoxVideos(sceneInfoVO);
 

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

@@ -272,4 +272,6 @@ public class SceneInfoVO {
 
     private Integer hasRecognition;
 
+    private Integer hasFloorplanAi;
+
 }