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/layout/RealTimeDeviceLayout.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/entity/layout/RealTimeDeviceLayout.java b/src/main/java/com/moral/entity/layout/RealTimeDeviceLayout.java
index 9b9b96c..690afdb 100644
--- a/src/main/java/com/moral/entity/layout/RealTimeDeviceLayout.java
+++ b/src/main/java/com/moral/entity/layout/RealTimeDeviceLayout.java
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -16,6 +17,11 @@
Integer id;
String name;
String chartSensorKey;
+ public RealTimeDeviceLayout () {
+ fixedMonitorItems = new ArrayList<>();
+ defaultMonitorItems = new ArrayList<>();
+ coreMonitorItems = new ArrayList<>();
+ }
List<SensorComb> fixedMonitorItems;
List<SensorComb> defaultMonitorItems;
List<SensorComb> coreMonitorItems;
--
Gitblit v1.8.0