Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-04 28b17e7a9b0bd3a8ed545aff4f077fe981db85d2

 src/main/java/com/moral/service/impl/DeviceServiceImpl.java

@@ -350,8 +350,8 @@
      if(pageBean.getPageSize()>0){

         PageHelper.startPage(pageBean.getPageIndex(),pageBean.getPageSize());

      }

      List<Device> organizationList = deviceMapper.selectWithRelationData(example);

      return new PageBean(organizationList);

      List<Device> deviceList = deviceMapper.selectWithRelationData(example);

      return new PageBean(deviceList);

   }



   @Override