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