From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
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 2ed16a4..e166457 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
@@ -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