Merge branch 'release-swsx' into test

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

@@ -1392,7 +1392,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if (cameraDetail.getType() == 9) {//看见
             cameraType = 13L;
         }
-        if (cameraDetail.getType() == 10 || cameraDetail.getType() == 11) {//深时、深光
+        if (cameraTypeService.isLaser(cameraDetail.getType())) {//深时、深光
             cameraType = 14L;
         }
         BuildSceneCallMessage message = null;