From 09c297c75f036f017dedfb163e338c6c427477d5 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 21 四月 2025 08:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb
---
cnas-device/src/main/resources/mapper/DeviceMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/resources/mapper/DeviceMapper.xml b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
index 5b557f1..33fd802 100644
--- a/cnas-device/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-device/src/main/resources/mapper/DeviceMapper.xml
@@ -90,7 +90,7 @@
, #{createTime})
</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