Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

Administrator

2018-11-21 c02e430f16cb51cabb6f4b24f99ec48efc7b0596

 gx_tieta/src/com/fgkj/services/Battalarm_dataService.java

@@ -291,7 +291,7 @@
      adata.setNum(numZ);//实时告警总数

      model.setCode(1);

      model.setData(adata);

      System.out.println(model.getData());

      //System.out.println(model.getData());

      return model;   

   }