From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +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/BattInfAction.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index ee929e1..105f209 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -380,14 +380,8 @@
//璺ㄥ煙璁块棶鑾峰彇鎵�鏈夌數姹犵粍鐨勪俊鎭�<-------璺ㄥ煙----------->
public String searchInform_ky(){
isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
- //System.out.println(key+"@@@@@@@@@@@@@@@@@@@@@@");
ServiceModel model = new ServiceModel();
- if(key != null && CROSS_DOMAIN_KEY.equals(key)){
- model = service.searchInform_ky();
- }else{
- model.setCode(0);
- model.setMsg("璇嗗埆鐮侀敊璇�");
- }
+ model = service.searchInform_ky();
result = ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1