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

zhangshuaibao

2021-04-08 229146483e520e49c3f39a7ff94753a46779babf

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

@@ -26,7 +26,7 @@
.win {
  position: relative;
  background-color: rgba(33, 41, 69, 0.9);
  height: 2.1rem;
  //height: 2rem;
}

.main {