增加顾客 后台判断顾客组是否为空
Merge branch 'master' of https://github.com/source3g/hermes.git
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/AccountController.java