From a04797899856a822c792530d0d65e88b3622ddd7 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期四, 09 五月 2024 13:43:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/ResourceUnit.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/ResourceUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/ResourceUnit.java similarity index 96% rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/ResourceUnit.java rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/ResourceUnit.java index 140fbf1..9f440af 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/resource/ResourceUnit.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/resource/ResourceUnit.java @@ -1,10 +1,11 @@ -package com.dy.aceMw.resource; +package com.dy.rtuMw.resource; import java.io.File; import java.text.DecimalFormat; import java.util.Date; import java.util.TreeMap; +import com.dy.rtuMw.resource.rtuLog.RtuLogNode; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.context.ApplicationContext; @@ -12,8 +13,7 @@ import com.dy.common.mw.UnitAdapterInterface; import com.dy.common.mw.UnitInterface; import com.dy.common.mw.UnitStartedCallbackInterface; -import com.dy.aceMw.resource.rtuLog.RtuLogManager; -import com.dy.aceMw.resource.rtuLog.RtuLogNode; +import com.dy.rtuMw.resource.rtuLog.RtuLogManager; import com.dy.common.util.DateTime; public class ResourceUnit implements UnitInterface { -- Gitblit v1.8.0