p96170835
/
diboot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

# Conflicts:
#	diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java
This commit is contained in:
Zhaoyang 2020-03-06 14:47:49 +08:00
parent 4bdc4237d6 8ab8ad20d9
commit d858e724fa
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java
View File

@ -107,8 +107,7 @@ public abstract class BaseExcelFileController extends BaseFileController {
throw e; throw e;
} }
// 绑定属性到model // 绑定属性到model
dataMap.put("header", listener.getHeadMap()); dataMap.put("header", listener.getFieldHeadMap());
dataMap.put("fieldHeaders", listener.getFieldHeaders());
dataMap.put(ORIGIN_FILE_NAME, fileName); dataMap.put(ORIGIN_FILE_NAME, fileName);
dataMap.put(PREVIEW_FILE_NAME, newFileName); dataMap.put(PREVIEW_FILE_NAME, newFileName);
List dataList = listener.getDataList(); List dataList = listener.getDataList();