add
Merge branch 'master' of https://github.com/wanglaoyao01/1-2saleApp

Conflicts:

1-2saleApp.xcodeproj/project.xcworkspace/xcuserdata/ty.xcuserdatad/UserI
nterfaceState.xcuserstate