From d803609b8a2e43afcf5921f42f29ce7f6e68fb84 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期三, 08 十一月 2023 17:02:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
index 63a35d5..f11397e 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
@@ -194,12 +194,11 @@
#{id}
</foreach>
</delete>
- <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 id="getCameraByRadar" resultType="ArdCameras">
+ select ac.* 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
where aer.id=#{radarId} limit 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3