From c936441a1288fa252520d1e7639d607caf7ba7b6 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 08 五月 2024 10:28:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolConfigVo.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolConfigVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolConfigVo.java
index 5ed316a..e2527d2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolConfigVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolConfigVo.java
@@ -4,8 +4,6 @@
 	public Integer centerAddr ;//涓績鍦板潃
 	public Boolean synchroRtuClock ;//鏄惁瀵筊TU鏍℃椂
 	public Integer synchroRtuClockTimepieces ;//褰揜TU涓庢湇鍔″櫒鏃堕挓鐩稿樊涓�瀹氭绉掞紙閰嶇疆鏂囦欢鏄閽燂級鍚庯紝杩涜鏍℃椂
-	public String serverIp ;//鏈嶅姟绔疘P鍦板潃锛屾眽濞佸崗璁腑鐢ㄥ埌
-	public Integer serverPort ;//鏈嶅姟绔鍙ｏ紝姹夊▉鍗忚涓敤鍒�
 
 	public Boolean showStartInfo; //鏄惁鍦ㄦ帶鍒跺彴涓婃樉绀轰俊鎭�
 }

--
Gitblit v1.8.0