Free-canteen/smart-canteen: 食堂 @ bff5d93e5b3d5a9096291553ba300dfec77004f1

guhongwei bff5d93e5b Merge branch 'master' of http://git.cc-lotus.info/Free-canteen/smart-canteen		3 gadi atpakaļ
..
calorie	4786d07ecc 页面	3 gadi atpakaļ
food	099c47a16a update	3 gadi atpakaļ
history	794871452a 1	3 gadi atpakaļ
home	a0ce89cfbf 1	3 gadi atpakaļ
login	bb94a43cf6 112	3 gadi atpakaļ
my	daecf0ed9c 112	3 gadi atpakaļ
news	bb94a43cf6 112	3 gadi atpakaļ
reserve	5c8769d301 update	3 gadi atpakaļ