Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git

zhangdaiscott · zhangdaiscott · commit bf6c5f46234e · 2020-11-14T18:31:43.000+08:00
diff --git a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
@@ -233,7 +233,7 @@ export const JeecgListMixin = {
       if(!fileName || typeof fileName != "string"){
         fileName = "导出文件"
       }
-      let param = {...this.queryParam};
+      let param = {...this.getQueryParams()};
       if(this.selectedRowKeys && this.selectedRowKeys.length>0){
         param['selections'] = this.selectedRowKeys.join(",")
       }

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ export const JeecgListMixin = {`
`233`	`233`	`if(!fileName \|\| typeof fileName != "string"){`
`234`	`234`	`fileName = "导出文件"`
`235`	`235`	`}`
`236`		`- let param = {...this.queryParam};`
	`236`	`+ let param = {...this.getQueryParams()};`
`237`	`237`	`if(this.selectedRowKeys && this.selectedRowKeys.length>0){`
`238`	`238`	`param['selections'] = this.selectedRowKeys.join(",")`
`239`	`239`	`}`