From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
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