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/services/Batt_enduranceService.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java b/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
index 307c099..7517bac 100644
--- a/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
+++ b/gx_tieta/src/com/fgkj/services/Batt_enduranceService.java
@@ -42,5 +42,12 @@
 		}
 		return model;
 	}
+	//瀵艰埅涓婄画鑸笉瓒�3灏忔椂鐨勪釜鏁�
+	public ServiceModel serchxuhangNotInThree(Object obj) {
+		int nums=((Batt_enduranceImpl)dao).serchxuhangNotInThree(obj);
+		model.setMsg("鏌ヨ鎴愬姛!");
+		model.setSum(nums);
+		return model;
+	}
 
 }

--
Gitblit v1.9.1