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

fengxiang

2018-03-20 a1c7c8f01bc80853b0b591bbb1742e7be9c72f5c

 src/app/business/entity/data.ts

@@ -137,7 +137,7 @@

export interface LineChartCriteria {
  dataConditions?: DataCondition[];
  sensorKey?: string;
  sensorKeys?: string[];
  timePeriod?: TimePeriod;
}