Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 bd0d111931cf15db84187e4a47e9c1e9e73affa4

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

}