Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

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