Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

 src/main/java/com/moral/mapper/DeviceMapper.java

@@ -41,4 +41,5 @@
   List<Map<String, Object>> getDevicesStateByRegion(Map<String, Object> parameters);



   List<Device> getDeviceList(Example example);

   String getLimitDataByDevice(Map<String, Object> parameters);

}