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

zss

昨天 40946ba6c24a0318f14cbed603f0ed9cad1da853

 src/main/java/com/ruoyi/device/mapper/DeviceRepairMapper.java

@@ -11,4 +11,6 @@
@Mapper
public interface DeviceRepairMapper extends BaseMapper<DeviceRepair> {
    IPage<DeviceRepairDto> queryPage(Page page, @Param("deviceRepairDto") DeviceRepairDto deviceRepairDto);

    DeviceRepairDto detailById(Long id);
}