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

liyong

6 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 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,