From 5c5fc86ebb905d5c0d09caef3d80f38b2aba6f18 Mon Sep 17 00:00:00 2001
From: 青城 <1662047068@qq.com>
Date: 星期三, 09 七月 2025 09:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into pim-qiao
---
src/main/resources/mapper/device/DeviceMaintenanceMapper.xml | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
index 2529b0a..0cf426a 100644
--- a/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
+++ b/src/main/resources/mapper/device/DeviceMaintenanceMapper.xml
@@ -6,7 +6,18 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceMaintenanceMapper">
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
- select dm.*,
+ select dm.id,
+ dm.device_ledger_id,
+ dm.maintenance_plan_time,
+ dm.maintenance_actually_time,
+ dm.maintenance_result,
+ dm.status,
+ dm.create_time,
+ dm.update_time,
+ dm.create_user,
+ dm.update_user,
+ dm.tenant_id,
+ dm.maintenance_actually_name,
dl.device_name,
dl.device_model,
su.user_name as create_user_name
@@ -23,7 +34,18 @@
</where>
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
- select dm.*,
+ select dm.id,
+ dm.device_ledger_id,
+ dm.maintenance_plan_time,
+ dm.maintenance_actually_time,
+ dm.maintenance_result,
+ dm.status,
+ dm.create_time,
+ dm.update_time,
+ dm.create_user,
+ dm.update_user,
+ dm.tenant_id,
+ dm.maintenance_actually_name,
dl.device_name,
dl.device_model,
su.user_name as create_user_name
--
Gitblit v1.9.3