From 4d9931f910e6cc210d6c6578215cc4639c4b47dd Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 13 十二月 2018 16:56:58 +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/Batt_enduranceAction.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
index 32b90d3..8afc13e 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_enduranceAction.java
@@ -19,9 +19,21 @@
result=tojson(model);
return SUCCESS;
}
-
+ //缁埅涓嶈冻1灏忔椂锛�2灏忔椂绛夌殑楗肩姸鍥�
+ public String serchByState_xuhang() {
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchByState_xuhang(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
-
+ //瀵艰埅涓婄画鑸笉瓒�3灏忔椂鐨勪釜鏁�
+ public String serchxuhangNotInThree() {
+ User_inf uinf=(User_inf) getUser();
+ ServiceModel model=service.serchxuhangNotInThree(uinf);
+ result=tojson(model);
+ return SUCCESS;
+ }
public String getResult() {
return result;
--
Gitblit v1.9.1