测试冲突如何解决
Merge branch 'master' of github.com:weston100721/zhaoliang
Conflicts:
	log4jTest/src/main/java/com/zhaoliang/mail/MainTest.java