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

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

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

@@ -98,8 +98,8 @@
    }

    @Override
    public List<SystemMenu> findByUserId(Integer userId) {
        return systemMenuMapper.selectByUserId(userId);
    public List<SystemMenu> findByUserId(Integer userId,Integer type) {
        return systemMenuMapper.selectByUserId(userId,type);
    }

    @Override