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/Batttestdata_infAction.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
index a78f163..89c21c4 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -94,14 +94,8 @@
*/
public String searchBattTestInfDataById_ky(){
isAllowHeaders();
- if(key != null && CROSS_DOMAIN_KEY.equals(key)){
- Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
- model=service.serchByCondition_ky(bti);
- }else{
- model = new ServiceModel();
- model.setCode(0);
- model.setMsg("璇嗗埆鐮侀敊璇�");
- }
+ Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);
+ model=service.serchByCondition_ky(bti);
result=ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1