From d0a7ad5e3a1c147a70a0e792c3eafa3b7613fff7 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 15:20:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/monitor/service/MgrService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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..36afc67 100644
--- a/src/main/java/com/moral/monitor/service/MgrService.java
+++ b/src/main/java/com/moral/monitor/service/MgrService.java
@@ -19,8 +19,8 @@
         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);}

--
Gitblit v1.8.0