From ff1dcdad798b3fd484439e8a87a4d0ac75ab5720 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 25 七月 2025 16:30:08 +0800
Subject: [PATCH] Merge branch 'dev_ztns' into dev_ywx_ztns
---
cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
index b6ab4cc..326ff4f 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMaintenanceMapper.xml
@@ -8,8 +8,8 @@
<select id="selectDeviceMaintenancePage" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
select * from (
select db.*,
- d.device_name,
- d.management_number
+ d.device_name as d_device_name,
+ d.management_number as d_management_number
from device_maintenance db
left join device d on db.device_id = d.id)a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
--
Gitblit v1.9.3