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

lizijie

2021-05-28 43e5052b91f0568ccbcf3fd6df70cf8209db184a

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

@@ -25,4 +25,9 @@
    @Transactional
    Map<String,Object> updateMonitorPoint(Map<String,Object> updateMap);

    @Transactional
    Map<String,Object> deleteMonitorPoint(Map map);

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

}