调整主键的定义，包括文档、SQL文件、myBatis.mapper.xml文件、定义类
主键判断的中间结果
Merge remote-tracking branch 'origin/new' into new
主键分析
Merge remote-tracking branch 'origin/new' into new

Conflicts:
	src/com/gmteam/spiritdata/upload/service/FileUploadService.java
	src/com/gmteam/spiritdata/upload/web/FileUpLoadController.java