modified:   src/main/resources/mybatis/sqlmap/UserMapper.xml
	modified:   ../pom.xml
Merge branch 'master' of https://github.com/rememberlostcode/flyhz