Merge remote-tracking branch 'origin/master'

lizijie

2020-11-05 ff4135a758efe532ee5566fbdb6d9fee9e8410f8

 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);

}