Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-03-05 42ac7e8242e0e6fa51816449f4d73f5e80114b9a

 src/app/routes/analysis/query/query.component.ts

@@ -1,5 +1,4 @@
import { getService } from './../../../../testing/common.spec';
import { LineChartCriteria, TimePeriod } from './../../../business/entity/data';
import { LineChartCriteria, TimePeriod } from '@business/entity/data';
import { PageBean } from '@business/entity/grid';
import { Sensor } from '@business/entity/data';
import { SensorsService } from '@business/services/http/sensors.service';