Merge branch 'score_shop' into api_score_meger

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

 zq-erp/src/main/resources/static/demoPage/soketTest.html

@@ -87,7 +87,7 @@
                console.log("您的浏览器支持WebSocket");
                //实现化WebSocket对象，指定要连接的服务器地址与端口  建立连接
                var userId = document.getElementById('userId').value;
                var socketUrl="ws://192.168.111.175:8091/webSocketServer?userId="+userId;
                var socketUrl="ws://localhost:8080/webSocketServer?userId="+userId;
                console.log(socketUrl);
                if(socket!=null){
                    socket.close();