Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

1
2
3
4
5
6
7
8
9
10
11
12
package com.moral.entity.charts;
 
import lombok.Data;
 
import java.util.List;
 
@Data
public class LineChartCriteria {
      private List<String> sensorKeys;//传感器类别
      private TimePeriod timePeriod;//时间区间
      private List<DataCondition> dataConditions;//数据取样条件
}