From 211789ba1102a46fd19e75c2643c7ed416ec9e8a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 22 十月 2024 17:33:06 +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/DataV1_0_1.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
index 78675d2..718adcc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataV1_0_1.java
@@ -9,21 +9,17 @@
public String rtuAddr ;//RtuAddr
- public DataCd02Vo dataCd02Vo;//閾捐矾妫�娴�
- public DataCdC0Vo dataCdC0Vo;//缁堢鑷姤瀹炴椂鏁版嵁
- public DataCd83OpenVo dataCd83OpenVo;//寮�闃�鑷姤
- public DataCd83CloseVo dataCd83CloseVo;//鍏抽榾鑷姤
- public DataCd84Vo dataCd84Vo;//寮�闃�宸ヤ綔鎶�
- public DataCd71Vo dataCd71Vo;//鏌ヨ闃�闂ㄧ姸鎬�
+ public Object subData ;
- public String dt ;//閫氫俊涓棿浠朵骇鐢熷彂鎶ユ椂闂�(yyyy-MM-dd hh:mm:ss)
+ public String dt ;//閫氫俊涓棿浠朵骇鐢熺殑鏀舵姤鏃堕棿(yyyy-MM-dd hh:mm:ss)
public String toString(){
StringBuffer sb = new StringBuffer() ;
sb.append(" 鎺у埗鍣ㄥ湴鍧� : " + (rtuAddr==null?"":rtuAddr) + "\n") ;
+ sb.append(" 鎺ユ敹鏁版嵁鏃堕棿 : " + (dt==null?"":dt) + "\n") ;
sb.append(" 缁堢鏁版嵁:\n") ;
- if(dataCd02Vo != null){
- sb.append(dataCd02Vo.toString()) ;
+ if(subData != null){
+ sb.append(subData.toString()) ;
}
return sb.toString() ;
}
--
Gitblit v1.8.0