Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

@@ -46,4 +46,8 @@
    List<Integer> getMonitorPointIds(Map<String, Object> params);



    List<MonitorPoint> byCodeGetMonitor(Map<String, Object> params);



    String getOrgIdByMac(String mac);



    String getMonitorName(int mpId);

}