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

徐旺旺

2021-04-07 682bfa52d2697aaf79a3815e99558cf07623bc7c

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -11,7 +11,7 @@
        <div class="public-bounced-content-left-bottom">
          <public-table v-if="value === 'gufei'"
                        :displayContentTable="displayContentTable"></public-table>
          <public-chart v-else></public-chart>
          <public-chart v-else :getWasteGasDetails="getWasteGasDetails"></public-chart>
        </div>
      </div>
      <div class="public-bounced-content-right">