From 339f905b431d73e2223bd81dd05db5054daad212 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期三, 19 十二月 2018 15:58:36 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index 8010397..ac4e031 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -39,11 +39,11 @@
* @return
*/
public String findhistory_ky(){
- isAllowHeaders();
+ //isAllowHeaders();
ServiceModel model = new ServiceModel();
+ btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
model = service.serchByCondition_ky(btd);
result = ActionUtil.tojson(model);
- //System.out.println("*************************");
return SUCCESS;
}
--
Gitblit v1.9.1