根据二维码点餐
Merge branch 'master' of http://github.com/secondflying/ChihuoPlatform.git