Merge remote-tracking branch 'origin/master'

沈斌

2018-01-30 b4cabe178f1a36433270c79048beecfab0edc487

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

@@ -9,8 +9,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);

@@ -22,4 +20,6 @@
   void deleteByIds(Integer[] ids);



    void addOrModify(Device device);



   List<Device> getDevicesByMonitorPointId(Integer monitorPointId);

}