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

chenyabin

2021-03-31 2596ad89b4a57d2129f0a58cbc77d364eeaf412d

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

@@ -30,6 +30,7 @@
.main {
  width: 100%;
  height: 100%;
  padding: 5px;
  .main-video {
    //border: 1px solid #396d83;
    width: 100%;