增加主食，菜类，酒水分类
Merge remote-tracking branch 'origin/master'