功图历史数据
Merge branch 'master' of https://github.com/bcw104/scada-oildata-webapp

Conflicts:
	src/main/java/com/ht/scada/oildata/Scheduler.java
	src/main/resources/application.development.properties
注释掉redis