fix some issues
Merge remote-tracking branch 'origin/master'

* origin/master:
  编辑：商户详情新增附近商户