Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

 blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -147,9 +147,9 @@
   }

   @Override
   public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId, String tenantId) {
   public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
      return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList));
   }

   @Override