From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 15 五月 2024 16:36:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java index 08bfef9..45a8386 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataStateVo.java @@ -4,20 +4,20 @@ @Data public class DataStateVo { - public Byte idCard ;// 钃勭數姹犵數鍘� - public Byte work;//宸ヤ綔鐘舵�� + public Byte icCard;// IC鍗″姛鑳� + public Byte working;//宸ヤ綔鐘舵�� public Byte valve ;//闃�闂� public String toString(){ StringBuilder str = new StringBuilder() ; str.append(" 鐘舵��:\n"); str.append(" IC 鍗″姛鑳斤細"); - str.append(idCard==null?"":(idCard==1?"鏈夋晥":"鏃犳晥")); + str.append(icCard ==null?"":(icCard ==1?"鏈夋晥":"鏃犳晥")); str.append("\n"); str.append(" 宸ヤ綔鐘舵�侊細"); - str.append(work ==null?"":(work==1?"鍚姩":"鍋滄")); + str.append(working ==null?"":(working ==1?"鍚姩":"鍋滄")); str.append("\n"); - str.append(" 闃�闂細"); + str.append(" 闃�闂ㄧ姸鎬侊細"); str.append(valve==null?"":(valve==1?"鎵撳紑":"鍏抽棴")); return str.toString() ; } -- Gitblit v1.8.0