病害类替换
Merge branch 'master' of https://github.com/team4us/Bridge

Conflicts:
	app/src/main/java/com/xiaohui/bridge/model/DiseaseModel.java