From cdf3a1a9b4606123f21261f4e5218dc8131333d6 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 21 Nov 2024 16:08:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9getBetaAnalyseBaseLineCou?=
 =?UTF-8?q?nt=20=E5=8F=96reso=E6=95=B0=E6=8D=AE=E5=8F=96=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/jeecg/common/util/SelfStationUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
index be2a4305..3b345886 100644
--- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
+++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/SelfStationUtil.java
@@ -1418,7 +1418,7 @@ public class SelfStationUtil extends SelfBaseUtil {
             return 0;
         }
         vBase = phd.getVBase();
-        currentText = StrUtil.isNotBlank(phd.getNewEner()) ? phd.getNewEner() : phd.getUsedEner();
+        currentText = StrUtil.isNotBlank(phd.getNewReso()) ? phd.getNewReso() : phd.getUsedReso();
         // 得到baseline count范围
         double fwhm = 0;
         // 公式参数