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

hdw

2018-11-29 c6457657e21adb5d6728e30a0a1adea58412d6cd

 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;