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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

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