更新
Merge branch 'master' of https://github.com/scott2lsb/EasyPayApi

Conflicts:
	.classpath
	.mymetadata
	.project
	WebRoot/WEB-INF/classes/config/jdbc.properties
	WebRoot/WEB-INF/classes/config/spring-mvc.xml
	WebRoot/WEB-INF/classes/config/spring-mybatis.xml
	WebRoot/WEB-INF/web.xml
	src/config/jdbc.properties
	src/config/spring-mvc.xml
	src/config/spring-mybatis.xml