Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

tangzy

2021-08-22 bb21e20b0542a3f23a12b0811c5e242783108ee5

 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);


   /**