Merge remote-tracking branch 'origin/master'

zengh

2021-04-09 279ee6197ef95b683733d450616ee80539f0a8bb

 src/views/healthcode/healthcode.vue

@@ -316,6 +316,14 @@
          };
        }

        if (this.$route.query.timeDesc) {
          values = {
            ...params,
            timeDesc: this.$route.query.timeDesc,
            ...this.query,
          };
        }

        this.loading = true;
        getList(page.currentPage, page.pageSize,values).then(res => {
          const data = res.data.data;