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

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

 web_src/src/components/gb28181/chooseChannelForGb.vue

@@ -72,7 +72,7 @@
            online: "",
            choosed: "",
            currentPage: 0,
            count: 15,
            count: 10,
            total: 0,
            eventEnanle: false