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

648540858

2022-07-03 e78c402a248ff252ee93e724396c62d806087fab

 web_src/src/router/index.js

@@ -59,7 +59,7 @@
          component: streamProxyList,
        },
        {
          path: '/channelList/:deviceId/:parentChannelId/:count/:page',
          path: '/channelList/:deviceId/:parentChannelId/',
          name: 'channelList',
          component: channelList,
        },