From 86916a5b7c8ed98221c03e440a9aad0f38109263 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 05 Sep 2018 09:52:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/MonitorPointService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/service/MonitorPointService.java b/src/main/java/com/moral/service/MonitorPointService.java
index 4328dc4..ad0afe4 100644
--- a/src/main/java/com/moral/service/MonitorPointService.java
+++ b/src/main/java/com/moral/service/MonitorPointService.java
@@ -23,7 +23,9 @@
List<MonitorPoint> getMonitorPointsByName(String name);
List<Map<String,String>> queryMonitroPointsState(List<Integer> idList);
- List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
+ Integer countOfSubOrgs(Integer orgId);
+
+ List<MonitorPoint> getMonitorPointsByOrganizationId(Integer orgId);
List<MonitorPoint> getMonitorPointsByRegion(Map<String, Object> parameters);
--
Gitblit v1.8.0