Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-23 47ebcea682a84322b303ad1bc64eb7c30dbb5ff4

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