From d4f150414533b95324b2a1c8a81c11d92efb71ec Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 13 Mar 2018 16:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2.git

---
 src/main/java/com/moral/config/MvcConfiguration.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/moral/config/MvcConfiguration.java b/src/main/java/com/moral/config/MvcConfiguration.java
index 7eff65c..7d63670 100644
--- a/src/main/java/com/moral/config/MvcConfiguration.java
+++ b/src/main/java/com/moral/config/MvcConfiguration.java
@@ -3,9 +3,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.*;
 import org.springframework.web.servlet.view.InternalResourceViewResolver;
 
 @Configuration
@@ -23,6 +21,4 @@
             DefaultServletHandlerConfigurer configurer) {
         configurer.enable();
     }
-
-
 }

--
Gitblit v1.8.0