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

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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

@@ -59,4 +59,6 @@
   String getLimitDataByDevice(Map<String, Object> parameters);



   Device getDeviceByLongitudeAsc(String mac);



    List<String> getMacsByOrganizationId(List<Object> organizationIdList);

}