merchant
Merge branch 'master' of https://github.com/zhaming/blueu
update user