商户注册修改
Merge branch 'master' of https://github.com/caining618/ytf_cust.git