Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 48570adc584224ea2ebafc90a58beb76e85dd4be

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

@@ -10,8 +10,6 @@


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



   List<Map<String, Object>> getSensorsByDevice(String mac);



   void saveOrUpdateDevice(Device device);



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