From 5f2cb6a7cb4fb1074ac52b9f643c57dd2bab478f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 29 十一月 2024 14:54:33 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
index 42d96ad..dc3f161 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeManager.java
@@ -92,11 +92,10 @@
if(this.task != null){
this.task.countRunningRtuCount();
if(this.task.curUgRunningRtuTotal > 0){
- return "褰撳墠瀛樺湪鍗囩骇涓殑璁惧锛屼笉鑳藉仠姝㈠崌绾т换鍔�" ;
+ return "褰撳墠瀛樺湪鍗囩骇涓殑璁惧锛屼笉鑳界粨鏉熷崌绾т换鍔�" ;
}else{
this.stop();
this.task.forceOver();
- this.task = null ;
return null ;
}
}else{
--
Gitblit v1.8.0