Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858

2021-11-24 dbcd050c66388bd9c8d9fdcf843458e38273b785

 web_src/src/components/dialog/StreamProxyEdit.vue

@@ -160,7 +160,7 @@
          type: "default",
          app: null,
          stream: null,
          url: "rtmp://58.200.131.2/livetv/cctv5hd",
          url: "",
          src_url: null,
          timeout_ms: null,
          ffmpeg_cmd_key: null,