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

doum

昨天 70ac6517f3e343ae59454c045eebf984fc6562b7

 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