From 13a4fc48d13482e97e9de04710eb53bed409228b Mon Sep 17 00:00:00 2001
From: htjcAdmin <qinyanlei@ht-atia.com>
Date: Wed, 21 May 2025 17:23:07 +0800
Subject: [PATCH] =?UTF-8?q?/*stash=20=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3*?=
 =?UTF-8?q?/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/inspect/analysis/utils/ResultAnalysisUtils.java   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
index 3ce784c..184dd65 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
+++ b/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("算法内部异常");