Merge branch 'dev_New_pro' into dev_襄垣县洁鑫商贸有限公司

云

2026-05-26 f582aad4d86f811649d5b1f2c17f0ed84ab150df

 src/main/resources/mapper/device/DeviceMaintenanceMapper.xml

@@ -51,7 +51,7 @@
            </if>
        </where>
    </select>
    <select id="detailById" resultType="com.ruoyi.device.dto.DeviceMaintenanceDto">
    <select id="detailById" resultType="com.ruoyi.device.vo.DeviceMaintenanceVo">
        select dm.id,
               dm.device_ledger_id,
               dm.maintenance_plan_time,