From 60bd6a383b3f7c0d4922517974da9525a0166b68 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 07 十二月 2023 10:45:36 +0800
Subject: [PATCH] 文件误删除后,本地重新找回后提交

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Data.java |   13 ++-----------
 1 files changed, 2 insertions(+), 11 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 3df78c2..68bc9f8 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,7 +6,6 @@
 
 /**
  * 鏁版嵁鏍�
- * @author Administrator
  *
  */
 public class Data  implements java.io.Serializable{
@@ -15,7 +14,6 @@
 
 	private String commandId ;//鍛戒护ID锛屽彲鑳戒负null
 	private String rtuAddr ;//缁堢鍦板潃
-	private String meterNo ;//姘磋〃鍙�
 	private String protocol ;//鏁版嵁鎵�瀵瑰簲鐨勫崗璁悕绉�
 	private String code ;//鏁版嵁鎵�瀵瑰簲鐨勫姛鑳界爜:
 	private Object subData ;//瀵瑰簲鍚勪釜鍔熻兘鐮佺殑鍏蜂綋鏁版嵁
@@ -24,8 +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("姘磋〃鍙� : ").append((meterNo==null?"":meterNo)).append("\n") ;
+		sb.append("Rtu鍦板潃 : ").append((rtuAddr==null?"":rtuAddr)).append("\n") ;
 		if(commandId != null){
 			sb.append("鍛戒护ID : ").append(commandId).append("\n") ; //鍛戒护ID
 		}
@@ -85,13 +82,7 @@
 	public void setRtuAddr(String rtuAddr) {
 		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