From 12f4b334eaccc8ce587fdbf012f371a14efb0317 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Fri, 16 Mar 2018 10:59:04 +0800
Subject: [PATCH] merge

---
 .../java/com/xwbing/configuration/ApplicationContextConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
index f765314..ff3bd3b 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java
@@ -20,7 +20,7 @@ import javax.servlet.Filter;
 //@ImportResource("classpath:applicationContext.xml")//用来加载其他xml配置文件
 public class ApplicationContextConfig {
     /**
-     * encoding编码问题(springBoot默认已经配置好)
+     * encoding编码问题(springBoot默认已经配置好,也可以在application.yml里配置)
      *
      * @return
      */