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

ZhuDongming

2019-06-12 9009798abd7abfd726bcda80267c7d53dd3b8da3

 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;