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

yaowanxin

昨天 2be90eb75452c8f0820d89cb1cd018dd86a351e0

 src/main/java/com/ruoyi/device/service/IDeviceRepairService.java

@@ -20,4 +20,5 @@

    void export(HttpServletResponse response, Long[] ids);

    DeviceRepairDto detailById(Long id);
}