去掉shiro验证，增加密码的校验
Merge branch 'SpringSecurity+springMVC' of
https://github.com/mhjian/GitTest into SpringSecurity+springMVC

Conflicts:
	erpweb/src/main/java/com/hejian/men/web/account/LoginController.java