添加搭食团页面UI搭建-杨声孟
Merge branch 'master' of https://github.com/MJie46/Eating2.0

Conflicts:
	Eating/Images.xcassets/.DS_Store
	Eating/Images.xcassets/LaunchImage.launchimage/.DS_Store
无
Merge branch 'master' of https://github.com/MJie46/Eating2.0

Conflicts:
	Eating/Images.xcassets/.DS_Store