From 0edab78d73d975663da8ce2596a0a00c1b6a6db1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 08:51:53 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 e7e632c..0a55545 100644
--- a/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java
@@ -93,13 +93,20 @@
result = tojson(model);
return SUCCESS;
}
- //瀵艰埅涓婂疄鏃舵煡璇�61850璁惧鐨勫浜庢牳瀹规祴璇曠殑鏁版嵁
+ //瀵艰埅涓婂疄鏃舵煡璇�61850璁惧鐨勫浜庢牳瀹规祴璇曠殑鏁版嵁
public String seach6185Nuclear_cap(){
User_inf uinf=(User_inf) getUser();
ServiceModel model = service.seach6185Nuclear_cap(uinf);
result = tojson(model);
return SUCCESS;
}
+ //瀵艰埅涓婂疄鏃舵煡璇ts澶勪簬鏀剧數娴嬭瘯鐨勬暟鎹殑璁惧
+ public String seachNuclear_cap(){
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model = service.seachNuclear_cap(uinf);
+ result = tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
}
--
Gitblit v1.9.1