Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

 src/main/java/com/moral/service/MonitorPointService.java

@@ -56,4 +56,6 @@
    List<MonitorPoint> getMonitorPointListByAccountId(int id);



    MonitorPoint byIdGetMonitorPoint(int id);



    String getOrgIdByMac(String mac);

}