From d3d3f559854042f8f71ece4e576cced226aa1605 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.137.1>
Date: 星期三, 19 十二月 2018 17:41:32 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index b24e635..3aceee1 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/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;
 	}

--
Gitblit v1.9.1