Merge branch 'release-swsx' into test

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

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

@@ -134,4 +134,11 @@ public class ScenePlus implements Serializable {
     @TableField("has_floorplan_ai")
     private Integer hasFloorplanAi;
 
+    /**
+     * 是否有禾赛
+     */
+    @TableField("has_hesai_data")
+    private Integer hasHesaiData;
+
+
 }

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1033,11 +1033,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlus.setSceneSource(SceneSource.QJKK.code());
         }
 
+        JSONObject fdageData = JSONObject.parseObject(fYunFileService.getFileContent(SceneUtil.getHomePath(scenePlusExt.getDataSource()) + "data.fdage"));
         scenePlusExt.setIsObj(1);
         if(cameraTypeService.isLaser(camType)){
-            JSONObject fdageData = JSONObject.parseObject(fYunFileService.getFileContent(SceneUtil.getHomePath(scenePlusExt.getDataSource()) + "data.fdage"));
             scenePlusExt.setIsObj(fdageData.getIntValue("exportMeshObj"));
         }
+        scenePlus.setHasHesaiData(fdageData.getIntValue("hasHeSaiData"));
 
         if (cameraTypeService.isLaser(camType)) {
             scenePlusExt.setModelKind(modelKind);