Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

xufenglei

2018-03-26 b4aa377b5e7898cd2ef018cc385a19af67a56839

 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;//数据取样条件
}