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

hdw

2018-11-20 fd77d548a62649faabcecd1c33352aa28cf8fead

 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;   

   }