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

gongchunyi

昨天 d80c1fe5bc2b604a27c2e985ea7593ba6618cc37

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

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

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

    DeviceRepairDto detailById(Long id);
}