.
Merge branch 'master' of https://github.com/source3g/hermes.git

Conflicts:
	hermes/hermes-web/src/main/java/com/source3g/hermes/merchant/controller/AccountController.java
修改顾客提醒设置和数据字典提醒设置
修改提醒BUG