冲突解决

code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx

@@ -65,7 +65,7 @@ const VideoPlay = ({
    iotVideoServer,
    local, //是否本地调用视频
 }) => {
-   console.log(sizeWh);
+   // console.log(sizeWh);
    if (videoObj.type == 'yingshi') {
       videoObj = {
          ...videoObj,