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

ZhuDongming

2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea

 src/main/java/com/moral/entity/charts/DataCondition.java

@@ -10,4 +10,6 @@
      private Integer actualTime;//实际时间
      private AreaRange areaRange;//区域范围
      private Integer areaRangeId;//区域范围的ID
      private DeviceDimension deviceDimension; // 维度类型
      private Object dimensionValue;// 维度值
}