From ce0d8cfacc6965285679269796057a64b101cc6e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十二月 2023 15:18:10 +0800
Subject: [PATCH] 测试冲突
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
index 3b9f364..3402f09 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java
@@ -22,7 +22,7 @@
public String toString() {
StringBuilder sb = new StringBuilder() ;
sb.append("涓婅鎶ユ枃(鍗佸叚杩涘埗): ").append((hex == null?"":hex)).append("\n") ; //
- sb.append("IMEI鍙� : ").append((rtuAddr==null?"":rtuAddr)).append("\n") ;
+ sb.append("Rtu鍦板潃 : ").append((rtuAddr==null?"":rtuAddr)).append("\n") ;
if(commandId != null){
sb.append("鍛戒护ID : ").append(commandId).append("\n") ; //鍛戒护ID
}
@@ -57,12 +57,10 @@
Data d = new Data() ;
d.code = "01" ;
d.rtuAddr = "123234" ;
- d.meterNo = "1234567890123456" ;
DataV1_0_1 subD = new DataV1_0_1() ;
subD.rtuAddr = "2342345" ;
- subD.meterNo = "1234567890123456" ;
-
+
d.subData = subD ;
--
Gitblit v1.8.0