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

panlinlin

2021-01-11 d94135c9cd8b12fc511055af4398ad3a584a44d6

 web_src/src/router/index.js

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