From fd77d548a62649faabcecd1c33352aa28cf8fead Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 20 十一月 2018 12:03:30 +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/BatttestdataAction.java | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index e50ffd1..8010397 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -41,14 +41,7 @@
public String findhistory_ky(){
isAllowHeaders();
ServiceModel model = new ServiceModel();
- if(key !=null && CROSS_DOMAIN_KEY.equals(key)){
- Batttestdata btd = ActionUtil.getGson().fromJson(json, Batttestdata.class);
- //System.out.println(btd);
- model = service.serchByCondition_ky(btd);
- }else{
- model.setCode(0);
- model.setMsg("璇嗗埆鐮侀敊璇�");
- }
+ model = service.serchByCondition_ky(btd);
result = ActionUtil.tojson(model);
//System.out.println("*************************");
return SUCCESS;
--
Gitblit v1.9.1