From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +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 | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
index e50ffd1..8064b68 100644
--- a/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BatttestdataAction.java
@@ -41,16 +41,9 @@
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("璇嗗埆鐮侀敊璇�");
- }
+ 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