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/DeviceMapper.xml | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
index 2d5c6c8..33fd802 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
@@ -89,13 +89,8 @@
, #{createUser}
, #{createTime})
</select>
- <select id="selectDevicePrincipal" resultType="com.ruoyi.device.pojo.Device">
- select id,
- equipment_manager
- from device
- </select>
- <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.pojo.Device">
+ <select id="selectDeviceParameterPage" resultType="com.ruoyi.device.dto.DeviceDto">
select * from(
SELECT
d.*,
--
Gitblit v1.9.3