g更新代码
更新代码
Merge branch 'master' of https://github.com/kiao295338444/cosmetology

Conflicts:
	Cosmetology.xcodeproj/project.pbxproj

Cosmetology.xcodeproj/project.xcworkspace/xcuserdata/mijie.xcuserdatad/U
serInterfaceState.xcuserstate
update