Merge branch 'master' of https://github.com/lipnpn123/yiyaotong

Conflicts:
.gitignore
Classes/mainClass/ask Price/AskPriceRootViewController.m
1

11
1

1