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/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