登录界面修改,只给手机发短信
Merge branch 'master' of https://github.com/source3g/hermes.git
登录错位
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-web/src/main/java/com/source3g/hermes/merchant/controller/CustomerController.java
	hermes/hermes-web/src/main/webapp/jsp/admin/login.jsp
	hermes/hermes-web/src/main/webapp/jsp/merchant/customer/callInList.jsp
Merge branch 'master' of https://github.com/source3g/hermes.git
快捷发送