From 16158b89f0223db6a4501e5263f6d2817b562b09 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 14 六月 2024 13:40:36 +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 |    4 ++--
 1 files changed, 2 insertions(+), 2 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 c4cb401..983a152 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
@@ -6,7 +6,7 @@
 public class DataAlarmVo {
     public Byte batteryVolt ;// 钃勭數姹犵數鍘�
     public Byte loss ;//婕忔崯
-    public Byte meter ;//浠〃
+    public Byte meter ;//娴侀噺璁℃晠闅�
     public Byte valve ;//闃�闂�
 
     public String toString(){
@@ -18,7 +18,7 @@
         str.append("         婕忔崯锛�");
         str.append(loss==null?"":(loss==1?"鎶ヨ":"姝e父"));
         str.append("\n");
-        str.append("         浠〃锛�");
+        str.append("         娴侀噺璁℃晠闅滐細");
         str.append(meter==null?"":(meter==1?"鎶ヨ":"姝e父"));
         str.append("\n");
         str.append("         闃�闂細");

--
Gitblit v1.8.0