Merge branch 'develop'

JiangYouYao

2022-03-15 b51ab926c93ac946fb9c78cdbad74cdb90e5e7e1

 zq-erp/src/main/java/com/matrix/config/WebSocketConfig.java

@@ -39,6 +39,7 @@
      LogUtil.info("注册WebSocket处理类");
      registry.addHandler(createWebSocketPushHandler(), "/webSocketServer")
            .addInterceptors(createHhandshakeInterceptor()).setAllowedOrigins("*");

      registry.addHandler(createWebSocketPushHandler(), "/sockjs/webSocketServer")
            .addInterceptors(createHhandshakeInterceptor()).withSockJS();