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

Administrator

2018-12-25 d7049dae792f0a6d2ee4246acf4b42bf0b36635c

 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;