没啥
Merge branch 'master' of https://github.com/XIAOPIU/beatyHelp

Conflicts:

beatyHelp.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdatad/Use
rInterfaceState.xcuserstate
木有