From beaa6e8dcf350fc50320518b9c92986785a2fac9 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 03 七月 2025 15:03:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/device/DeviceRepairMapper.xml | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/device/DeviceRepairMapper.xml b/src/main/resources/mapper/device/DeviceRepairMapper.xml
index d754e43..cc88490 100644
--- a/src/main/resources/mapper/device/DeviceRepairMapper.xml
+++ b/src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -6,7 +6,20 @@
<mapper namespace="com.ruoyi.device.mapper.DeviceRepairMapper">
<select id="queryPage" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.*,
+ select dr.id,
+ dr.device_ledger_id,
+ dr.repair_time,
+ dr.repair_name,
+ dr.remark,
+ dr.maintenance_name,
+ dr.maintenance_time,
+ dr.maintenance_result,
+ dr.status,
+ dr.create_time,
+ dr.update_time,
+ dr.create_user,
+ dr.update_user,
+ dr.tenant_id,
dl.device_name,
dl.device_model
from device_repair dr
@@ -21,11 +34,24 @@
</where>
</select>
<select id="detailById" resultType="com.ruoyi.device.dto.DeviceRepairDto">
- select dr.*,
+ select dr.id,
+ dr.device_ledger_id,
+ dr.repair_time,
+ dr.repair_name,
+ dr.remark,
+ dr.maintenance_name,
+ dr.maintenance_time,
+ dr.maintenance_result,
+ dr.status,
+ dr.create_time,
+ dr.update_time,
+ dr.create_user,
+ dr.update_user,
+ dr.tenant_id,
dl.device_name,
dl.device_model
from device_repair dr
- left join device_ledger dl on dr.device_ledger_id = dl.id
+ left join device_ledger dl on dr.device_ledger_id = dl.id
where dr.id = #{id}
</select>
--
Gitblit v1.9.3