Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

9 天以前 b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/SysMenuController.java

@@ -30,7 +30,7 @@
        MyChannelHandlerPool myChannelHandlerPool = new MyChannelHandlerPool();
        //myChannelHandlerPool.sendMsg("123");
        //MyChannelHandlerPool.channelGroup.writeAndFlush( new TextWebSocketFrame("123123"));
        return Result.seccess(sysMenuService.getMenu(lang));
        return Result.success(sysMenuService.getMenu(lang));

    }
}