From 60806825951c111ac107dec87bd3acc5a7d6a707 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 03 三月 2026 10:07:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index e0e2879..4336014 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -40,8 +40,7 @@
dm.maintenance_actually_name,
dl.device_name,
dl.device_model,
- su.nick_name as create_user_name,
- dm.spare_parts_ids
+ dm.spare_parts_ids,
su.nick_name as create_user_name,
dm.images_file
from device_maintenance dm
--
Gitblit v1.9.3