/*stash 冲突解决*/

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -66,10 +66,7 @@ public class ResultAnalysisUtils {
             resultAnalysis.setResultType("2");
             resultAnalysis.setResStatus("0");
             if ("meter".equals(algType)) {
-<<<<<<< Updated upstream
-=======
                 //defaultDesc = messageUtils.get("与样本有差异");
->>>>>>> Stashed changes
                 defaultDesc = messageUtils.get("读数失败");
             } else {
                 defaultDesc = messageUtils.get("算法内部异常");