Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-17 fb1932ed607f0aa5474a6339ea86a83ae5a5089e

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

@@ -28,4 +28,6 @@

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

    Map<String,Object> getSensorByFuzzy(Map map);
}