From 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 17:04:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

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

diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index adbc77a..e0e2879 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -41,6 +41,8 @@
         dl.device_name,
         dl.device_model,
         su.nick_name as create_user_name,
+        dm.spare_parts_ids
+        su.nick_name as create_user_name,
         dm.images_file
         from device_maintenance dm
         left join device_ledger dl on dm.device_ledger_id = dl.id

--
Gitblit v1.9.3