Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/screen_api_...

xufenglei

2019-06-17 dbed3099ea0dd2a517b739f29943d4ee529760e6

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

}