下班前提交
Merge branch 'master' of https://github.com/q188079726/healthManager

Conflicts:
	Class/ViewController/MainViewController/MainViewController.m