冲突制造
Merge branch 'master' of github.com:weston100721/zhaoliang

Conflicts:
	log4jTest/src/main/java/com/zhaoliang/reflecttest/Test2.java