just commit
Merge branch 'dev' of https://github.com/baiyushiwhite/ZSH.git into dev

Conflicts:
	src/com/zsh/dao/CraftsmanDao.java
	src/com/zsh/dao/impl/CraftsmanDaoImpl.java