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

didiyu

2018-12-13 4d9931f910e6cc210d6c6578215cc4639c4b47dd

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

@@ -27,7 +27,13 @@
      return SUCCESS;

   }

   

	
   //导航上续航不足3小时的个数

   public String serchxuhangNotInThree() {

      User_inf uinf=(User_inf) getUser();

      ServiceModel model=service.serchxuhangNotInThree(uinf);

      result=tojson(model);

      return SUCCESS;

   }

   

   public String getResult() {

      return result;