From e9bf5a0070b5fbdf9afd4475adbf51e46f579040 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 17 四月 2025 17:20:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb --- cnas-device/src/main/resources/mapper/DeviceInspectionRecordMapper.xml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cnas-device/src/main/resources/mapper/DeviceInspectionRecordMapper.xml b/cnas-device/src/main/resources/mapper/DeviceInspectionRecordMapper.xml index af4ac42..8540d74 100644 --- a/cnas-device/src/main/resources/mapper/DeviceInspectionRecordMapper.xml +++ b/cnas-device/src/main/resources/mapper/DeviceInspectionRecordMapper.xml @@ -4,9 +4,8 @@ <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.pojo.DeviceInspectionRecord"> - SELECT - * - from device_inspection_record + select * from ( SELECT * + from device_inspection_record ) a <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''"> ${ew.customSqlSegment} </if> -- Gitblit v1.9.3