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

panlinlin

2021-01-07 397e0c4a27c231e40cbc48b657cbd9fc88bc7ebb

 web_src/src/router/index.js

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