update code for merchant
Merge branch 'master' of github.com:haoHu/merchant