From 09ca173e170e815fc995d6e2d93a92e752d2b63a Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Mon, 8 Dec 2025 18:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mappers/ex/DeviceInfoMapperExt.xml      | 1 +
 .../java/com/dongjian/dashboard/back/vo/data/BaseData.java     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
index d23d822..e1a4acf 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml
@@ -8,6 +8,7 @@
         basic_floor.name as floorName,
         device_info.id,
         device_info.device_id,
+        device_info.device_name,
         device_info.device_sn,
         device_info.type_id,
         device_info.retain_alert,
diff --git a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java
index de8b255..f99afca 100644
--- a/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java
+++ b/dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java
@@ -12,6 +12,9 @@ public class BaseData {
     @Schema(description = "deviceId", example = "12-34")
     private String deviceId;
 
+    @Schema(description = "device name", example = "12-34")
+    private String deviceName;
+
     @Schema(description = "upload timestamp", example = "1740033000234")
     private Long uploadTimestamp;