From ffc50d168847df14f38f64612f55a6dd81d6a7c3 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 22 十一月 2018 09:38:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
index 3762e11..f06e421 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -114,12 +114,7 @@
public String serchByCondition_ky(){
isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
ServiceModel model = new ServiceModel();
- if(key != null && CROSS_DOMAIN_KEY.equals(key)){
- model = service.serchByCondition_ky();
- }else{
- model.setCode(0);
- model.setMsg("璇嗗埆鐮侀敊璇�");
- }
+ model = service.serchByCondition_ky();
result = tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1