hy1216000
Merge branch 'master' of https://github.com/jijunyuan/JJYPackage

Conflicts:

JJYPackage.xcodeproj/project.xcworkspace/xcuserdata/tiankong360.xcuserda
tad/UserInterfaceState.xcuserstate
0000000000000