Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

2026-05-25 7ab45e2b02facae5685ba879d150de6dc0032aa4

 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,