a
第三方登录，还差绑定界面
登录
Merge branch '修改头像'
no message
Merge commit '661bac96c01187f4568b389a01ab08420deaacca'

Conflicts:
	ScreenShow/我/MyStoryBoard.storyboard
test
ss
ss
ss
第三方登录还差绑定界面，消费记录还需要显示总金额
Merge branch 'master' of https://github.com/jacklibonnie/ios-demo
Merge pull request #8 from liop/master

liop'修改第三方登录的实现