From 9687fd99fdf6208dbf747ea45c440f192a9af815 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期五, 14 三月 2025 17:43:16 +0800 Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev --- 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