From 222c8c6e1826b476163fbdd670fad6b7f577665b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 15 十二月 2023 18:03:22 +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/threadPool/TreadPoolFactory.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
index 040913d..f7c34ee 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/threadPool/TreadPoolFactory.java
@@ -8,9 +8,9 @@
 	
 	/**
 	 * 鍒濆鍖栫嚎绋嬫睜
-	 * @param threadPoolName 绾跨▼姹犲拰绾跨▼鍚嶇О
-	 * @param maxThreadNum 绾跨▼姹犳渶澶х嚎绋嬫暟 锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
-	 * @param minThreadNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
+	 * @param poolName 绾跨▼姹犲拰绾跨▼鍚嶇О
+	 * @param maxNum 绾跨▼姹犳渶澶х嚎绋嬫暟 锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
+	 * @param minNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
 	 * @param freeTimeout 绌洪棽绾跨▼瓒呮椂鏃堕暱(绉�)
 	 * @param busyTimeout 蹇欑绾跨▼瓒呮椂鏃堕暱(绉�)锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
 	 * @return 绾跨▼姹犲疄渚�
@@ -30,9 +30,9 @@
 	
 	/**
 	 * 鍒濆鍖栫嚎绋嬫睜
-	 * @param threadPoolName 绾跨▼姹犲拰绾跨▼鍚嶇О
-	 * @param maxThreadNum 绾跨▼姹犳渶澶х嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
-	 * @param minThreadNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
+	 * @param poolName 绾跨▼姹犲拰绾跨▼鍚嶇О
+	 * @param maxNum 绾跨▼姹犳渶澶х嚎绋嬫暟锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
+	 * @param minNum 绾跨▼姹犳渶灏忕嚎绋嬫暟锛屾垨鍒濆绾跨▼鏁�
 	 * @param freeTimeout 绌洪棽绾跨▼瓒呮椂鏃堕暱(绉�)
 	 * @param busyTimeout 蹇欑绾跨▼瓒呮椂鏃堕暱(绉�)锛岃嫢涓�-1锛屼笉鍙楅檺鍒�
 	 * @return 绾跨▼姹犲疄渚�
@@ -51,7 +51,6 @@
 	}
 	/**
 	 * 寰楀埌鍞竴绾跨▼姹犲疄渚�
-	 * @param dataSourceName
 	 * @return
 	 * @throws Exception
 	 */
@@ -64,7 +63,6 @@
 	}
 	/**
 	 * 寰楀埌鍞竴绾跨▼姹犲疄渚�
-	 * @param dataSourceName
 	 * @return
 	 * @throws Exception
 	 */

--
Gitblit v1.8.0