From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +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 | 12 +++---------
1 files changed, 3 insertions(+), 9 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..00a9aca 100644
--- a/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batttestdata_infAction.java
@@ -93,15 +93,9 @@
* 鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勭殑inf琛ㄤ腑鐨勬斁鐢典俊鎭� <!------ 璺ㄥ煙璁块棶 --------->
*/
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("璇嗗埆鐮侀敊璇�");
- }
+ //isAllowHeaders();
+ 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