Merge remote-tracking branch 'origin/master'

sgj

12 小时以前 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

 fzzy-igdss-web/src/main/resources/static/group/video.js

@@ -79,7 +79,7 @@
    initHtml();

    // 初始化WebSocket
    initWS(companyId,"screen",null,null);
    initWS(companyId,bizType, bizTag, userId);
});

// 初始化页面