From 75432e263f73a89baed5dc4c4cccbe2ca7d6d446 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 03 三月 2025 10:05:54 +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/p206V202404/upVos/DataCd56Vo.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java index 7b367ba..9833afe 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd56Vo.java @@ -6,8 +6,8 @@ @Data public class DataCd56Vo { - public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣� - public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣� + public String controllerType;//鎺у埗鍣ㄧ被鍨� + public Integer projectNo ;//椤圭洰缂栧彿 public Integer waterAlarm ;//鍓╀綑姘撮噺鎶ヨ鍊�,鍗曚綅:m3銆傛暣鏁帮紝鍙栧�艰寖鍥�0~65535 public Integer moneyAlarm ;//鍓╀綑閲戦鎶ヨ鍊�,鍗曚綅:鍏冦�傛暣鏁帮紝鍙栧�艰寖鍥�0~65535 @@ -26,7 +26,7 @@ sb.append(" 椤圭洰缂栧彿 : ") ; sb.append(projectNo == null?"鏈煡":projectNo) ; sb.append("\n") ; - sb.append(" 鍓╀綑姘撮噺鎶ヨ鍊� : ") ; + sb.append(" 鍓╀綑閲戦鎶ヨ鍊� : ") ; sb.append(moneyAlarm == null?"鏈煡":moneyAlarm) ; sb.append("\n") ; sb.append(" 鍓╀綑姘撮噺鎶ヨ鍊� : ") ; -- Gitblit v1.8.0