Merge remote-tracking branch 'origin/dev_ztzb' into dev_ztzb

zhuo

2025-04-21 09c297c75f036f017dedfb163e338c6c427477d5

 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.*,