From 0ee940c32fb24ec0eaa6548beb476f2beb2cce62 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 01 八月 2024 08:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
index 86c3e72..575caae 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataAlarmVo.java
@@ -41,16 +41,16 @@
         StringBuilder str = new StringBuilder() ;
         str.append("      鎶ヨ:\n");
         str.append("         钃勭數姹犵數鍘嬶細");
-        str.append(batteryVolt==null?"":(batteryVolt==1?"鎶ヨ":"姝e父"));
+        str.append(batteryVolt==null?"":(batteryVolt==1?"鎶ヨ(1)":"姝e父(0)"));
         str.append("\n");
         str.append("         婕忔崯锛�     ");
-        str.append(loss==null?"":(loss==1?"鎶ヨ":"姝e父"));
+        str.append(loss==null?"":(loss==1?"鎶ヨ(1)":"姝e父(0)"));
         str.append("\n");
         str.append("         娴侀噺璁℃晠闅滐細");
-        str.append(meter==null?"":(meter==1?"鎶ヨ":"姝e父"));
+        str.append(meter==null?"":(meter==1?"鎶ヨ(1)":"姝e父(0)"));
         str.append("\n");
         str.append("         闃�闂細     ");
-        str.append(valve==null?"":(valve==1?"鎶ヨ":"姝e父"));
+        str.append(valve==null?"":(valve==1?"鎶ヨ(1)":"姝e父(0)"));
         return str.toString() ;
     }
 }

--
Gitblit v1.8.0