Merge branch 'developer'

935090232@qq.com

2022-03-02 512a37c0fb21415efea656fe8c72ce4102d9f662

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