Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-01 d940d0b4c0e7d6fcebfb0fea2bed1c514e1f796f

 hangzhoumesParent/common/springsecurity/src/main/java/com/mes/menu/service/impl/SysMenuServiceImpl.java

@@ -69,6 +69,7 @@

        //
        List<SysMenu> menuList = sysUserRoleMapper.selectJoinList(SysMenu.class, wrapper);
        log.info("userinfos:{}",menuList);
        return create(menuList);
    }