merchantMain 沿用 merchant
Merge pull request #23 from InsCake/master

merchantMain 沿用 merchant