Merge remote-tracking branch 'origin/master'

xiebin

2022-08-30 0bc3c246857eb2b9c2ef1f803a7d5b4043451d84

Merge remote-tracking branch 'origin/master'

 src/views/statistics/farmplantarea.vue

@@ -112,7 +112,7 @@
                        span: 12,
                        hide: true,
                        search: true,
                        searchSpan: 6,
                        searchSpan: 7,
                        searchLabelWidth: 110,
                        searchRange: true,
                        searchValue: [this.getStartTime(), this.getEndTime()],

 src/views/statistics/farmproductstockstatistics.vue

@@ -192,7 +192,7 @@
            span: 12,
            hide: true,
            search: true,
            searchSpan: 6,
            searchSpan: 7,
            searchLabelWidth: 110,
            searchRange: true,
            searchValue: [this.getStartTime(), this.getEndTime()],

 src/views/statistics/stock.vue

@@ -130,7 +130,7 @@
            span: 12,
            hide: true,
            search: true,
            searchSpan: 6,
            searchSpan: 7,
            searchLabelWidth: 110,
            searchRange: true,
            searchValue: [this.getStartTime(), this.getEndTime()],