加入河道水库的统计信息
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/app/FetchCityDistrictWeatherApp.java
	src/main/java/models/locationInfo/CityDistrictBean.java
	src/main/java/service/DistrictWeatherInfoService.java
	src/main/java/service/WeatherStatusService.java
	src/main/resources/hibernate.cfg.xml