DishLabelInfo
dishLabelinfo删除细节修改
Merge branch 'master' of
ssh://git@github.com/xiaojinshishen/ChihuoServer.git

Conflicts:
	hibernate/WebRoot/WEB-INF/classes/hibernate.cfg.xml
	hibernate/src/hibernate.cfg.xml