卖家详情， 设置页面
Merge branch 'master' of https://github.com/quansoso/quansoso_prj

Conflicts:
	Quansoso/Quansoso/SettingView/QSSettingView.m
解决了冲突