modify
Merge branch 'master' of github.com:wangyoucao/xinyu

Conflicts:
	test/src/main/java/com/github/miemiedev/smt/repository/UserDao.mbts.xml