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

liop'修改第三方登录的实现
修改了消费记录
Merge branch 'liop_test'
测试
Merge branch 'master' of https://github.com/jacklibonnie/ios-demo into liop-test2
1、加第三方绑定

1、加第三方绑定
Merge branch 'liop-test2'