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/dao/MgrDao.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/monitor/dao/MgrDao.java b/src/main/java/com/moral/monitor/dao/MgrDao.java
index e74fd86..99c4143 100644
--- a/src/main/java/com/moral/monitor/dao/MgrDao.java
+++ b/src/main/java/com/moral/monitor/dao/MgrDao.java
@@ -12,12 +12,12 @@
@Repository
public interface MgrDao {
- public List<MonitorPoint> randpoint();
+ public List<Monitorpoint> randpoint();
public List<Equipment> pointequ(String monitorpoint);
public List<State> equsensorstate(@Param("mac") String mac);
- public List<MonitorPoint> allpoint();
+ public List<Monitorpoint> allpoint();
public List<PointAvg> allPointsData(QueryHelper queryHelper);
public int pointcount(QueryHelper queryHelper);
--
Gitblit v1.8.0