Merge branch 'release-swsx' into test

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

@@ -1709,7 +1709,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                         cameraType = 13L;
                     }
 
-                    if (CollUtil.isNotEmpty(laserCamTypeList) && laserCamTypeList.contains(detailEntity.getType())) {
+                    if (cameraTypeService.isLaser(detailEntity.getType())) {
+                        //激光转台
                         cameraType = 14L;
                     }