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

panlinlin

2021-01-12 71aace5569d33f48336d8c50730264cafef0f673

 web_src/src/components/videoList.vue

@@ -134,7 +134,7 @@
            this.getDeviceListLoading = true;
            this.$axios.get(`/api/devices`,{
               params: {
                  page: that.currentPage - 1,
                  page: that.currentPage,
                  count: that.count
               }
            } )