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

panlinlin

2021-01-12 b6137471535fc88ba3b2a9e8beec9bb01850f4b3

 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',