Merge branch 'test' of http://192.168.0.115:3000/lyhzzz/4dkankan-center-user into test

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

@@ -123,6 +123,12 @@ public class SceneJsonBean {
     private String sceneKind;
 
     /**
+     * 算法模型类型（dam,3dtiles）
+     */
+    private String modelKind;
+
+
+    /**
      * 空间视频数据
      */
     private String boxVideos;

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

@@ -124,6 +124,13 @@ public class ScenePlusExt implements Serializable {
     private String sceneKind;
 
     /**
+     * 算法模型类型（dam,3dtiles）
+     */
+    @TableField("model_kind")
+    private String modelKind;
+
+
+    /**
      * 点位视频
      */
     @TableField("videos")

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -264,6 +264,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 sceneJson.setSceneResolution(plusExt.getSceneResolution());
                 sceneJson.setSceneFrom(plusExt.getSceneFrom());
                 sceneJson.setSceneKind(plusExt.getSceneKind());
+                sceneJson.setModelKind(plusExt.getModelKind());
                 if(StrUtil.isNotEmpty(plusExt.getVideos())){
                     sceneJson.setVideos(plusExt.getVideos());
                 }