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-global/src/main/resources/mapper/SpecialMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
index d3c3f3e..01a5a70 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SpecialMapper.xml
@@ -28,6 +28,7 @@
</trim>
</select>
+
<select id="selectStealSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal">
select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
@@ -65,7 +66,6 @@
</select>
-
<select id="selectAbnormalCloseValveTotal" parameterType="java.util.Map" resultType="java.lang.Long">
select
count(*)
@@ -92,7 +92,8 @@
</trim>
</select>
- <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoSteal">
+
+ <select id="selectAbnormalCloseValveSome" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve">
select mTb.id as id, mTb.intake_id as intakeId, mTb.client_id as clientId,
piTb.name as intakeNum, piTb.lng as intakeLng, piTb.lat as intakeLat,
scTb.name as clientName, scTb.clientNum as clientNum,
--
Gitblit v1.8.0