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

chenyabin

2021-04-16 7cb82d5220007f1c619b9ac76abbe975c4d212d5

 src/components/BaseNav/PublicBounced/PublicBounced.vue

@@ -76,7 +76,7 @@
      this.displayContentTable = dataDetailed[0]
    },
    setGasData (data, dataDetails, GasHourData, ManualData, value) {
      console.log(data, dataDetails, GasHourData, ManualData, value)
      // console.log(data, dataDetails, GasHourData, ManualData, value)
      this.setWasteGasdata = data
      this.displayContentTitle = data.Name
      this.getWasteGasDetails = dataDetails