Merge remote-tracking branch 'origin/dev' into dev

lizijie

2021-05-25 aecc6316d0a6bcb3119dc062106deb5a57cdd790

 screen-manage/src/main/java/com/moral/api/service/MonitorPointService.java

@@ -28,4 +28,6 @@
    @Transactional
    Map<String,Object> deleteMonitorPoint(Map map);

    Map<String,Object> getMonitorPointByFuzzy(Map map);

}