From 64f1199ba78e7c8e808f735290b5486398b4e447 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.32>
Date: 星期五, 23 十一月 2018 10:45:17 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/BatttestdataAction.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index 8010397..8064b68 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -41,9 +41,9 @@
public String findhistory_ky(){
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