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

chenlu

昨天 3247273b3505b42c400251ee2fc0921affaadf40

 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));

    }
}