test git pull merge
Merge branch 'master' of github.com:wangzhenxyz1/misc

Conflicts:
	src/main/java/com/wangzhen/config/DBConfig.java
add image
fix spring mvc json chinese garbled