Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/service/SensorUnitService.java

@@ -22,4 +22,6 @@
    
    Map<String, Map<String, Object>> getSensorsByMonitPointId(String id);
    
    List<Map<String, Object>> getSensorsByMonitPointId2(String id);
    
}