Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/mapper/HistoryHourlyMapper.java

@@ -5,4 +5,8 @@
public interface HistoryHourlyMapper {

    Map<String, Object> getPollutionSourceData(Map<String, Object> parameters);

    Map<String, Object> getPollutionSourceDataByHour(Map<String, Object> parameters);

    Map<String, Object> getPollutionSourceDataAll(Map<String, Object> parameters);
}