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

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

@@ -39,4 +39,6 @@
   Collection<Object> getDevicesStateByRegion(Map<String, Object> parameters);



   void isCompensateCalculation(Map<String, Object> parameters);

	
   Map<String, Object> selectAllById(String id);

}