Merge remote-tracking branch 'origin/develop' into develop

yangdelong

2021-04-09 653c004b4f44396cdb4dce04c17152c7563e37f8

 src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue

@@ -27,11 +27,12 @@
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
  //height: 2rem;
  width: 3rem;
}

.main {
  border: 1px solid #396d83;
  padding: 5px;
  //padding: 5px;
  height: 2rem;

  video {