From 29c0c7bb739abb85775224e1ca346a2fd0ae1abe Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 30 Sep 2025 11:22:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mapper):=20=E4=BF=AE=E6=94=B9=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=AD=97=E6=AE=B5=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 EmsAlarmDeviceMapper.xml 中的 location_name 别名修改为 name- 将 EmsAlarmRecordMapper.xml 中的 location_name 别名修改为 name
- 统一位置信息字段引用方式，提升代码一致性
---
 klp-ems/src/main/resources/mapper/EmsAlarmDeviceMapper.xml | 2 +-
 klp-ems/src/main/resources/mapper/EmsAlarmRecordMapper.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/klp-ems/src/main/resources/mapper/EmsAlarmDeviceMapper.xml b/klp-ems/src/main/resources/mapper/EmsAlarmDeviceMapper.xml
index fd32435e..caba2563 100644
--- a/klp-ems/src/main/resources/mapper/EmsAlarmDeviceMapper.xml
+++ b/klp-ems/src/main/resources/mapper/EmsAlarmDeviceMapper.xml
@@ -36,7 +36,7 @@
         d.update_time,
         d.del_flag,
         d.remark,
-        l.location_name AS locationName
+        l.name AS locationName
         FROM
         ems_alarm_device d
         LEFT JOIN ems_location l ON d.location_id = l.location_id
diff --git a/klp-ems/src/main/resources/mapper/EmsAlarmRecordMapper.xml b/klp-ems/src/main/resources/mapper/EmsAlarmRecordMapper.xml
index a67d9c3b..08c34290 100644
--- a/klp-ems/src/main/resources/mapper/EmsAlarmRecordMapper.xml
+++ b/klp-ems/src/main/resources/mapper/EmsAlarmRecordMapper.xml
@@ -43,7 +43,7 @@
         d.device_name AS deviceName,
         d.device_code AS deviceCode,
         d.device_type AS deviceType,
-        l.location_name AS locationName
+        l.name AS locationName
         FROM
         ems_alarm_record r
         LEFT JOIN ems_alarm_device d ON r.device_id = d.device_id