修正POS注册用户注册bug
Merge remote-tracking branch 'origin/master'

* origin/master:
  add merchant search