From 5447abaae60e4d8d98c52c952a10d9c4ad6c06d6 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 27 六月 2024 09:19:20 +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/MidResultToRtu.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
index 4c58abe..45864bb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/MidResultToRtu.java
@@ -10,11 +10,9 @@
 		serialVersionUID = 201606271057003L;
 	}
 
+	public String rtuResultSendWebUrl ;//rtu杩斿洖鍛戒护缁撴灉 鍙戝悜鐩殑鍦皐eb URL
 	public String protocolName ;//鍗忚鍚嶇О
-	public String rtuAddr ;//IMEI鍙�(鐢典俊骞冲彴IMEI)
-	public String meterNo ;//姘磋〃鍙�
-	public Integer productId ;//鐢典俊骞冲彴浜у搧ID
-	public String deviceId ;//鐢典俊骞冲彴璁惧ID
+	public String rtuAddr ;//Rtu鍦板潃
 	public String commandId ;//鍛戒护ID锛屽彂璧峰懡浠ょ殑瀹㈡埛绔�(web绔�)鐢熸垚锛屼互鍖归厤鍛戒护缁撴灉
 	public String downCode ;//涓嬭鍛戒护鍔熻兘鐮�;
 	public byte[] downBuffer ;//涓嬭鍛戒护鏁版嵁
@@ -25,7 +23,9 @@
 	
 	public boolean isSendFirst;//浼樺厛鍏朵粬鍙戦�侊紝渚嬪鍚勫懡浠ょ殑搴旂瓟
 	public boolean isQuickSend;//閫熷彂鍛戒护锛屽嵆涓嶅彈涓嬪彂鏁版嵁鏃堕棿闂撮殧闄愬埗
-	
+
+	public Object param ;//缂撳瓨涓�浜涙暟鎹紝渚嬪涓哄吋瀹圭帇宸ワ紙姹熸捣锛夊崗璁笌闈虫�诲崗璁紙铏氭嫙IC鍗$紪鍙烽暱搴︿笉涓�鑷达級锛屾妸涓嶅吋瀹圭殑铏氭嫙IC鍗$紪鍙风殑鍓嶅崐閮ㄥ垎鏀惧叆姝ゅ
+
 	public MidResultToRtu(){
 		hasResponse = true ;
 		isCachForOffLine = false ;

--
Gitblit v1.8.0