Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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

}