Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

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

}