Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-27 b082da73a1e0259738ccb33ebf7d80cad3dc3a10

 ruoyi-ui/src/views/demo/demo/index.vue

@@ -358,7 +358,7 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      this.downLoadExcel('/demo/demo/export', this.queryParams);
      this.$download.excel('/demo/demo/export', this.queryParams);
    }
  }
};