From 99ea8b4fc0d7fdd866797b33c7ce773730d42afa Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 11 六月 2024 15:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index 55cede3..57330a5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -3,12 +3,10 @@
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
 import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
 import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V1_0_0.DataAlarmVo;
-import com.dy.common.mw.protocol.p206V1_0_0.DataStateVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataStateVo;
 import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.util.DateTime;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
 import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

--
Gitblit v1.8.0