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/PrMonitoringFlowmeterMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
index 55fc9d3..916a032 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/PrMonitoringFlowmeterMapper.xml
@@ -150,8 +150,13 @@
<!--鏍规嵁 娴侀噺鐩戞祴绔欑紪鍙� 鑾峰彇 缁戝畾璁板綍 鎸夋搷浣滄椂闂撮檷搴�-->
<select id="getBingRecordsByMonitoringId" parameterType="string" resultType="java.util.Map">
- select CAST(pmf.id AS char)AS id,
- <include refid="Base_Column_List_NoId" />
+ select CAST(id AS char) as id,
+ CAST(monitoringId AS char)as monitoringId,
+ CAST(flowmeterId AS char)as flowmeterId,
+ operateType,
+ remarks,
+ `operator`,
+ operateDt
from pr_monitoring_flowmeter pmf
where
monitoringId=#{monitoringId,jdbcType=BIGINT}
--
Gitblit v1.8.0