开发完毕
Merge branch 'master' of https://github.com/wghwang/hangzhou_health

Conflicts:

code/Demo/Demo.xcodeproj/project.xcworkspace/xcuserdata/jendy.xcuserdata
d/UserInterfaceState.xcuserstate