文件管理部份的修改
文件框架修改
Merge remote-tracking branch 'origin/master' into newSet

Conflicts:
	src/com/gmteam/spiritdata/importdata/pojo/ImportFileLog.java
	src/com/gmteam/spiritdata/importdata/sql/ImportFileLog.mapper.xml
	src/com/gmteam/spiritdata/login/service/LoginServiceImpl.java
	src/com/gmteam/spiritdata/upload/service/DealUploadFileService.java