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

doum

2 天以前 6cf36f0e43c9add691b9a375526ce7dc26209574

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

@@ -83,8 +83,8 @@
    }

    @Override
    public List<SystemMenuListVO> findList() {
        return systemMenuMapper.selectManageList();
    public List<SystemMenuListVO> findManageList(SystemMenu menu) {
        return systemMenuMapper.selectManageList(menu);
    }

    @Override