From 58f51c889aecd7065a82b99d29b3ef4aee891ec1 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 25 Oct 2017 16:31:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/monitor/service/MgrService.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/monitor/service/MgrService.java b/src/main/java/com/moral/monitor/service/MgrService.java
index cbfbe72..651a575 100644
--- a/src/main/java/com/moral/monitor/service/MgrService.java
+++ b/src/main/java/com/moral/monitor/service/MgrService.java
@@ -15,18 +15,18 @@
@Resource
MgrDao mgrDao;
- public List<MonitorPoint> randpoint(){
+ public List<Monitorpoint> randpoint(){
return mgrDao.randpoint();
}
- public List<Equipment> pointequ(String monitorpoint){
- return mgrDao.pointequ(monitorpoint);
+ public List<Equipment> pointequ(String Monitorpoint){
+ return mgrDao.pointequ(Monitorpoint);
}
public List<State> equsensorstate(String mac){return mgrDao.equsensorstate(mac);}
- public List<MonitorPoint> allpoint(){
+ public List<Monitorpoint> allpoint(){
return mgrDao.allpoint();
}
--
Gitblit v1.8.0