From 36c5eeab117846d64aa632ca30ef7ac15ef20a27 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 19 Mar 2018 16:44:14 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/business/entity/data.ts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/business/entity/data.ts b/src/app/business/entity/data.ts
index c2458bb..06e1770 100644
--- a/src/app/business/entity/data.ts
+++ b/src/app/business/entity/data.ts
@@ -137,7 +137,7 @@
 
 export interface LineChartCriteria {
   dataConditions?: DataCondition[];
-  sensorKey?: string;
+  sensorKeys?: string[];
   timePeriod?: TimePeriod;
 }
 

--
Gitblit v1.8.0