Merge branch 'release-mg-v2.9.0' into test

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -667,7 +667,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         }
         int mixture = CommonStatus.NO.code();
         //如果点位数量和帧数都不为空，就是混合模式
-        if(Objects.nonNull(scenePlusExt.getShootCount()) && Objects.nonNull(scenePlusExt.getSlamCount())){
+        if(Objects.nonNull(scenePlusExt.getShootCount()) && scenePlusExt.getShootCount() > 0
+                && Objects.nonNull(scenePlusExt.getSlamCount()) && scenePlusExt.getSlamCount() > 0){
             mixture = CommonStatus.YES.code();
         }
         scenePlusExt.setMixture(mixture);