Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-16 cd264145f9b4107f1430da46269dd306d26f3116

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

}