Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

@@ -48,4 +48,6 @@
    List<MonitorPoint> byCodeGetMonitor(Map<String, Object> params);



    String getOrgIdByMac(String mac);



    String getMonitorName(int mpId);

}