fix bug: rename and add column of merchant_infos
Merge branch 'master' of github.com:china-east-soft/YPortal
add quick login to uses controller
Merge branch 'master' of github.com:china-east-soft/YPortal