加入扫一扫功能
更新
xxx
提交到主分支
增加注册页面
添加找回密码页
UIState
qqq
111
Merge branch 'YHBranch'

Conflicts:

HuiTuTicket.xcodeproj/project.xcworkspace/xcuserdata/Chemayi.xcuserdatad
/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/iOS-Programmers/HuiTuTicket

Conflicts:

HuiTuTicket.xcodeproj/project.xcworkspace/xcuserdata/Chemayi.xcuserdatad
/UserInterfaceState.xcuserstate