修改了工程
Merge branch 'master' of https://github.com/yangjunfeng22/HelloHSK

Conflicts:

HelloHSK.xcodeproj/project.xcworkspace/xcuserdata/yang.xcuserdatad/UserI
nterfaceState.xcuserstate