Merge branch 'score_shop' into api_score_meger

Helius

2021-11-19 66f8eeab8b21f81e310d3f7cbc2766bb8b2ec0d5

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