From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 三月 2025 14:24:50 +0800 Subject: [PATCH] 1、git同步冲突引起文件丢失,进行系统恢复,并屏蔽一个非git提交的模块; 2、增加文件《增加一个单位(orgTag)》。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/records/RecordsSv.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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 f1adb13..0ef668a 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,6 +5,8 @@ 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