继续完成菜品详情页面
Merge branch 'master' of https://github.com/hbtelecom/AutoQueue

Conflicts:
	AutoQueue.xcodeproj/project.pbxproj
	AutoQueue/.DS_Store