From 1cbd89e5aceb71e990c42b8599e45f2703588878 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Mon, 06 Nov 2017 13:39:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/com/moral/monitor/controller/ScreenApiController.java b/src/main/java/com/moral/monitor/controller/ScreenApiController.java
index 37b8ebc..4f114a7 100644
--- a/src/main/java/com/moral/monitor/controller/ScreenApiController.java
+++ b/src/main/java/com/moral/monitor/controller/ScreenApiController.java
@@ -15,8 +15,8 @@
 /**
  * Created by a on 2017/7/12.
  */
-@Controller
-@RequestMapping(value = "screen")
+//@Controller
+//@RequestMapping(value = "screen")
 public class ScreenApiController {
 
     @Resource

--
Gitblit v1.8.0