From b2f21d080425b0ab6e5e6170914ca2c615e5d185 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期三, 02 一月 2019 10:22:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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..081c8ba 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -112,14 +112,9 @@
//11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
public String serchByCondition_ky(){
- isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //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