提交修改
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/design/gpps.pdm
	src/main/java/gpps/dao/ILenderDao.java
	src/main/java/gpps/dao/LenderDao.xml
	src/main/webapp/WEB-INF/spring/conf.properties