From a37271af0a5a2eb04ca23c80cca32567c968fa8e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 25 七月 2024 15:00:33 +0800
Subject: [PATCH] 解决git冲突

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java   |    2 --
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsCtrl.java |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsCtrl.java
index 25f859e..952336d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsCtrl.java
@@ -9,8 +9,6 @@
 import com.dy.pipIrrGlobal.voRm.VoControllerAlarmState;
 import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay;
 import com.dy.pipIrrGlobal.voSe.VoActiveCard;
-import com.dy.pipIrrRemote.records.clientAmountDay.ClientAmountDayQueryVo;
-import com.dy.pipIrrRemote.records.controllerAlarmState.ControllerAlarmStateQueryVo;
 import com.dy.pipIrrRemote.records.intakeAmountDay.IntakeAmountDayQueryVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java
index 0ef668a..f1adb13 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java
@@ -5,8 +5,6 @@
 import com.dy.pipIrrGlobal.voRm.VoClientAmountDay;
 import com.dy.pipIrrGlobal.voRm.VoControllerAlarmState;
 import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay;
-import com.dy.pipIrrRemote.records.clientAmountDay.ClientAmountDayQueryVo;
-import com.dy.pipIrrRemote.records.controllerAlarmState.ControllerAlarmStateQueryVo;
 import com.dy.pipIrrRemote.records.intakeAmountDay.IntakeAmountDayQueryVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.common.utils.PojoUtils;

--
Gitblit v1.8.0