Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -69,11 +69,9 @@
    *
    * @param page
    * @param user
    * @param deptId
    * @param tenantId
    * @return
    */
   IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
   IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user);

   /**
    * 自定义分页
@@ -277,4 +275,6 @@
    * @return
    */
   UserVO getUserAgeById(Long userId);

   List<Map<String, Object>> selectUser();
}