Merge branch 'score_shop' into api_score_meger

jyy

2021-07-22 de5d98edb80742185b91b2d892167b82a8b64430

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