From 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 14:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/charts/LineChartCriteria.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/charts/LineChartCriteria.java b/src/main/java/com/moral/entity/charts/LineChartCriteria.java
index 589a25e..6472203 100644
--- a/src/main/java/com/moral/entity/charts/LineChartCriteria.java
+++ b/src/main/java/com/moral/entity/charts/LineChartCriteria.java
@@ -6,7 +6,7 @@
@Data
public class LineChartCriteria {
- private String sensorKey;//���������������
+ private List<String> sensorKeys;//���������������
private TimePeriod timePeriod;//������������
private List<DataCondition> dataConditions;//������������������
}
--
Gitblit v1.8.0