更改测试文件
Merge branch 'master' of https://github.com/bcw104/scada-data

Conflicts:
	src/test/java/com/ht/scada/data/service/RealtimeDataServiceTest.java
Merge branch 'master' of https://github.com/bcw104/scada-data
Merge branch 'master' of https://github.com/bcw104/scada-data
Merge branch 'master' of https://github.com/bcw104/scada-data

Conflicts:
	src/test/java/com/ht/scada/data/service/RealtimeDataServiceTest.java
Merge branch 'master' of https://github.com/bcw104/scada-data
添加遥脉历史曲线支持
Merge branch 'master' of https://github.com/bcw104/scada-data