From 6688e50ba02988d742baadaca156a303a90b6191 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 20 Apr 2018 14:03:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/controller/MobileController.java b/src/main/java/com/moral/controller/MobileController.java
index ff56619..1f4e182 100644
--- a/src/main/java/com/moral/controller/MobileController.java
+++ b/src/main/java/com/moral/controller/MobileController.java
@@ -117,7 +117,7 @@
 	/**
 	 * Gets the monitor points by area name.
 	 *
-	 * @param areaName the area name
+	 * @param request the area name
 	 * @return the monitor points by area name
 	 */
 	@GetMapping("getMpointsByAreaName")
@@ -130,7 +130,7 @@
 	/**
 	 * Gets the organizations by area name.
 	 *
-	 * @param areaName the area name
+	 * @param request the area name
 	 * @return the organizations by area name
 	 */
 	@GetMapping("getOrgsByAreaName")

--
Gitblit v1.8.0