From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/entity/charts/DataCondition.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/charts/DataCondition.java b/src/main/java/com/moral/entity/charts/DataCondition.java
index 65bf0f8..67f0d7d 100644
--- a/src/main/java/com/moral/entity/charts/DataCondition.java
+++ b/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;// ���������
}
--
Gitblit v1.8.0