完成新的菜品管理数据库修改
Merge branch 'master' of https://github.com/arebya/eserver.git

Conflicts:
	src/test/java/com/cloudstone/emenu/quickStart/EserverStart.java