Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

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

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


   /**