Merge remote-tracking branch 'origin/master'

Administrator

2021-12-06 0cabea1fb1196c666b6e676e0f3446815c4ae82f

 src/main/java/org/springblade/modules/system/mapper/UserMapper.java

@@ -47,7 +47,7 @@
    * @param tenantId
    * @return
    */
   List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
   List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);

   /**
    * 获取用户