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

81041

2018-11-29 a6f784d801885a6a2c785206d12085c19be3f9e3

 gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java

@@ -45,8 +45,7 @@
   //0.5查询实时告警数(电池告警率)

   public String serchAlm(){

      User_inf uinf=(User_inf) ActionUtil.getUser();

      bmd.setUinf(uinf);

      ServiceModel model=service.serchAlm(bmd);

      ServiceModel model=service.serchAlm(uinf);

      result=ActionUtil.tojson(model);      

      return SUCCESS;

   }