From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +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/ram/Fbs9100_stateAction.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 0a55545..081c8ba 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -2,6 +2,8 @@
import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
import com.fgkj.actions.ActionUtil;
import com.fgkj.dto.BattInf;
import com.fgkj.dto.ServiceModel;
@@ -107,6 +109,17 @@
result = tojson(model);
return SUCCESS;
}
+
+ //11.1FBS9100璁惧閫氫俊鐘舵�佹煡璇� <-- 璺ㄥ煙 -->
+ public String serchByCondition_ky(){
+ //isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ ServiceModel model = new ServiceModel();
+ model = service.serchByCondition_ky();
+ result = tojson(model);
+ return SUCCESS;
+ }
+
+
public String getResult() {
return result;
}
--
Gitblit v1.9.1