From d08e95f9a5a86c75ba7b8cd1e23b50a4eac41bff Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 22 五月 2026 11:19:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

---
 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2ed16a4..e21669f 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -19,6 +19,7 @@
         dm.tenant_id,
         dm.maintenance_actually_name,
         dl.device_name,
+        dm.machinery_category,
         dl.device_model,
         su.nick_name as create_user_name
         from device_maintenance dm
@@ -50,7 +51,7 @@
             </if>
         </where>
     </select>
-    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
+    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
         select dm.id,
                dm.device_ledger_id,
                dm.maintenance_plan_time,
@@ -62,6 +63,7 @@
                dm.create_user,
                dm.update_user,
                dm.tenant_id,
+               dm.machinery_category,
                dm.maintenance_actually_name,
                dl.device_name,
                dl.device_model,

--
Gitblit v1.9.3