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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue

@@ -77,8 +77,8 @@
      formInline: {
        user: '',
        region: '',
        timeStart: '2021-03-14 00:00:00',
        timeEnd: '2021-04-12 00:00:00'
        timeStart: '2021-03-15 00:00:00',
        timeEnd: '2021-04-13 00:00:00'
      },
      JsonDateWater: {
        datatype: 1,
@@ -319,7 +319,8 @@
            grid: { // 网格
              top: '20%',
              left: '7%',
              bottom: '10%'
              bottom: '11%',
              right: '5%'
            },
            legend: {
              data: legend