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

xufenglei

2018-01-05 930adc902c0d0a81b685e7d3f0443df50cb608a0

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

@@ -14,4 +14,6 @@
   void saveOrUpdateDevice(Device device);



   List<Device> getInstallDevicesByOperateUser(Integer uid, Integer pageIndex, Integer pageSize);



   Device getDeviceByMac(String mac);

}