From b6d93e08adb11e7f4584173d9d44dbc7c7508e9f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 17:50:23 +0800
Subject: [PATCH] 测试冲突

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnitAdapter.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnitAdapter.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnitAdapter.java
index 91ab2f0..21b2ec0 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnitAdapter.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/ProtocolUnitAdapter.java
@@ -11,19 +11,19 @@
 	ProtocolConfigVo getConfig() ;
 	/**
 	 * 鍗曠嚎绋嬬幆澧冧腑杩愯锛屽緱鍒板崟涓鐞哛TU涓嬭鏁版嵁鐨刟ction鎵ц瀵硅薄
-	 * @param protocolName
+	 * @param protocolName 鍗忚鍚嶇О
 	 * @return MidResultAction
 	 */
 	MidResultAction getSingleActionToRtu(String protocolName) ;
 	/**
 	 * 鍗曠嚎绋嬬幆澧冧腑杩愯锛屽緱鍒板崟涓鐞哛TU涓婅鏁版嵁鐨刟ction鎵ц瀵硅薄
-	 * @param protocolName
+	 * @param protocolName 鍗忚鍚嶇О
 	 * @return MidResultAction
 	 */
 	MidResultAction getSingleActionFromRtu(String protocolName) ;
 	/**
 	 * 鍗曠嚎绋嬬幆澧冧腑杩愯锛屽緱鍒板崟涓鐞嗗嚭閿欑殑action鎵ц瀵硅薄
-	 * @param protocolName
+	 * @param protocolName 鍗忚鍚嶇О
 	 * @return MidResultAction
 	 */
 	MidResultAction getSingleActionError(String protocolName) ;

--
Gitblit v1.8.0