From 700e079156d633305b5e03c3a4e54b78a49add51 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 09:29:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 6819e98..b35e1dc 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -159,11 +159,9 @@
and aar.view_time is null
</select>
<select id="getCameraByRadar" resultType="String">
- select ac.id
- from ard_equip_radar aer
- INNER JOIN ard_towers at
- on aer.tower_id= at.id
- INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
+ select ac.id from ard_equip_radar aer
+ INNER JOIN ard_towers at on aer.tower_id= at.id
+ INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
</select>
<select id="getArdAlarmRadarWithGuide" resultMap="ArdAlarmRadarResult">
select *
--
Gitblit v1.9.3