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

lizijie

2021-05-28 43e5052b91f0568ccbcf3fd6df70cf8209db184a

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