实体类修改
Merge branch 'master' of https://github.com/zhanghao-py/dingding.git

Conflicts:
	src/main/java/cn/edu/bjut/weichat/core/bo/Dish.java