Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-02 539a7077cbf638a5aa9ae5e46c17be96daba7d9b

 src/main/java/com/moral/controller/ScreenController.java

@@ -610,10 +610,10 @@
            }

         }

      }

      if(rtdLayout.getDefaultMonitorItems().size() == 0 ) {

      if(rtdLayout!=null && rtdLayout.getDefaultMonitorItems().size() == 0 ) {

         rtdLayout.getDefaultMonitorItems().addAll(rtdLayout.getCoreMonitorItems());

      }

      return new ResultBean(rtdLayout);

      return new ResultBean(rtdLayout == null? new RealTimeDeviceLayout():rtdLayout);

   }



   @GetMapping("report_avg_data")