。。。
replace
Merge branch 'master' of https://github.com/dingt/VOYA into master1

Conflicts:

VOYA/VOYA.xcodeproj/project.xcworkspace/xcuserdata/Eva.xcuserdatad/UserI
nterfaceState.xcuserstate
updated