Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job

kaiyu

2020-11-24 3152a4e4dadcd6ebfb8e882aa356d063416d49cc

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -38,4 +38,6 @@

    List<String> getMacsByMonitorPointIds(List<Integer> list);

    List<Map<String, Object>> getAllByMacList(List<String> list);

}