Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-16 6f443126a5d9d2a1a8211b2583ee6d5c2f86975d

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