From 999d8a80d9a1c1f20033c29e7e2a08951766bee8 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Mon, 13 Nov 2017 16:16:34 +0800
Subject: [PATCH] Merge branch 'master' of http://fengxiang@blit.7drlb.com:8888/r/task.git
---
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 651a575..36afc67 100644
--- a/src/main/java/com/moral/monitor/service/MgrService.java
+++ b/src/main/java/com/moral/monitor/service/MgrService.java
@@ -15,7 +15,7 @@
@Resource
MgrDao mgrDao;
- public List<Monitorpoint> randpoint(){
+ public List<MonitorPoint> randpoint(){
return mgrDao.randpoint();
}
@@ -26,7 +26,7 @@
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