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

yaowanxin

昨天 97f84227acd789843541382a9625fe81d279c443

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

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

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

    DeviceRepairDto detailById(Long id);
}