Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

}