解决冲突
解决冲突
解决冲突
Merge branch 'master' of github.com:yangkai2005/ibatis_app_example

Conflicts:
	src/main/java/org/facejava/dao/UserDaoImpl.java
	src/main/java/org/facejava/test/TestUserDao.java
	src/main/reources/SqlMapConfig.xml