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

hdw

2018-12-21 04a4d6499ecb8460810a0dc3b1caa0d3c896e7a3

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

@@ -54,8 +54,8 @@
   }

   //查询出所有需要确认的申请

   public String serchByCondition(){

      Page page=ActionUtil.getGson().fromJson(json, Page.class);

      ServiceModel model=service.serchByCondition(page);

      Battinf_apply bapply=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Battinf_apply.class);

      ServiceModel model=service.serchByCondition(bapply);

      result=tojson(model);

      return SUCCESS;

   }