Merge remote-tracking branch 'origin/master'

tangzy

2021-03-26 afda08833e460a40a2d4e509f9df9d809c6f8f31

 blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java

@@ -49,10 +49,10 @@
    * @param page
    * @param user
    * @param deptIdList
    * @param tenantId
    * @param
    * @return
    */
   List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
   List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList);

   /**
    * 获取用户