From 00d6941eed41108925b81b6c6534f97a278e57ca Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Mon, 20 Nov 2017 15:56:56 +0800
Subject: [PATCH] merge

---
 .../java/com/xwbing/configuration/DispatcherServletConfig.java | 2 --
 .../src/main/java/com/xwbing/configuration/SwaggerConfig.java  | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
index 39118d7..ac6a31b 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java
@@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@@ -20,7 +19,6 @@ import java.util.List;
  * 创建时间: 2017/5/10 16:36
  * 作者:  xiangwb
  */
-@EnableWebMvc
 @Configuration
 public class DispatcherServletConfig extends WebMvcConfigurerAdapter {
     /***
diff --git a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
index 12cb2b4..9b7e359 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/SwaggerConfig.java
@@ -2,6 +2,7 @@ package com.xwbing.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
@@ -17,7 +18,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  * 创建时间: 2017/5/10 16:36
  * 作者:  xiangwb
  */
-
+@EnableWebMvc
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {