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

chenlu

2024-03-18 723edfdd07208ec27409d1cffb70b9a4eac69446

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

@@ -21,7 +21,6 @@
    private SysMenuService sysMenuService;
    @GetMapping("/getMenu/{lang}")
    public Result getMenu(@PathVariable String lang){
        System.out.println(lang);
        MyChannelHandlerPool myChannelHandlerPool = new MyChannelHandlerPool();
        //myChannelHandlerPool.sendMsg("123");
        //MyChannelHandlerPool.channelGroup.writeAndFlush( new TextWebSocketFrame("123123"));