Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-14 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11

 server/service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java

@@ -121,7 +121,7 @@
        Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
        return systemUserMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
        // 根部门条件处理（需查询根部门下所有部门的用户）