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

didiyu

2018-11-22 ffc50d168847df14f38f64612f55a6dd81d6a7c3

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

@@ -385,6 +385,13 @@
      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

   //首页上显示已安装数和全部基站数

   public String serchDevice(){

      User_inf uinf=(User_inf) getUser();

      ServiceModel model = service.serchDevice(uinf);

      result = ActionUtil.tojson(model);

      return SUCCESS;

   }

   

   public BattInf getBif() {

      return bif;