From b4cabe178f1a36433270c79048beecfab0edc487 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/MonitorPointController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/controller/MonitorPointController.java b/src/main/java/com/moral/controller/MonitorPointController.java
index 9174cf5..8076b91 100644
--- a/src/main/java/com/moral/controller/MonitorPointController.java
+++ b/src/main/java/com/moral/controller/MonitorPointController.java
@@ -35,7 +35,7 @@
      */
     @GetMapping("get-by-id")
     public ResultBean getById(Integer id){
-        MonitorPoint monitorPoint = monitorPointService.selectWithRelationById(id);
+        MonitorPoint monitorPoint = monitorPointService.queryWithRelationById(id);
         ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
         resultBean.setData(monitorPoint);
         return resultBean;

--
Gitblit v1.8.0