Merge branch 'developer' into alpha

Helius

2022-03-14 b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7

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