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

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

 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;// 维度值
}