From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
index 6dd943d..44e86e0 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100s_dfu_stateAction.java
@@ -66,7 +66,12 @@
 		result=tojson(model);
 		return SUCCESS;
 	}
-	
+	//鍗囩骇鐣岄潰瀹炴椂鍒锋柊
+	public String searchAll(){
+		ServiceModel model=service.searchAll();
+		result=tojson(model);
+		return SUCCESS;
+	}
 	public String getResult() {
 		return result;
 	}

--
Gitblit v1.9.1