From 7c98e347015e96a7683dbb08b36495c75c54bea5 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 28 十一月 2023 08:33:22 +0800
Subject: [PATCH] 回退

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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 58b5ede..cbc9b69 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
@@ -6,6 +6,7 @@
 
 /**
  * 鏁版嵁鏍�
+ * @author Administrator
  *
  */
 public class Data  implements java.io.Serializable{
@@ -14,6 +15,7 @@
 
 	private String commandId ;//鍛戒护ID锛屽彲鑳戒负null
 	private String rtuAddr ;//缁堢鍦板潃
+	private String meterNo ;//姘磋〃鍙�
 	private String protocol ;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁悕绉�
 	private String code ;//鏁版嵁鎵�瀵瑰簲鐨勫姛鑳界爜:
 	private Object subData ;//瀵瑰簲鍚勪釜鍔熻兘鐮佺殑鍏蜂綋鏁版嵁
@@ -22,7 +24,8 @@
 	public String toString() {
 		StringBuilder sb = new StringBuilder() ;
 		sb.append("涓婅鎶ユ枃(鍗佸叚杩涘埗): ").append((hex == null?"":hex)).append("\n") ; //
-		sb.append("Rtu鍦板潃 : ").append((rtuAddr==null?"":rtuAddr)).append("\n") ;
+		sb.append("IMEI鍙� : ").append((rtuAddr==null?"":rtuAddr)).append("\n") ;
+		sb.append("姘磋〃鍙� : ").append((meterNo==null?"":meterNo)).append("\n") ;
 		if(commandId != null){
 			sb.append("鍛戒护ID : ").append(commandId).append("\n") ; //鍛戒护ID
 		}
@@ -85,6 +88,12 @@
 		this.rtuAddr = rtuAddr;
 	}
 	
+	public String getMeterNo() {
+		return meterNo;
+	}
+	public void setMeterNo(String meterNo) {
+		this.meterNo = meterNo;
+	}
 	public String getCode() {
 		return code;
 	}

--
Gitblit v1.8.0