Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

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