From b91bf7f2c52bd7c16ad4435628fd4487a0ca8d09 Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Wed, 7 Mar 2018 16:21:57 +0800 Subject: [PATCH] merge --- boot-service/src/main/java/com/xwbing/util/JSONObjResult.java | 2 +- .../java/com/xwbing/configuration/ApplicationContextConfig.java | 2 +- .../java/com/xwbing/configuration/DispatcherServletConfig.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java index 1e7be50..0f5bc79 100644 --- a/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java +++ b/boot-service/src/main/java/com/xwbing/util/JSONObjResult.java @@ -31,7 +31,7 @@ public class JSONObjResult { /** * 查询返回值为Object - * @param o + * @param o Object/List * @param message * @return */ 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 3e00006..f289880 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/ApplicationContextConfig.java @@ -33,7 +33,7 @@ public class ApplicationContextConfig { } /** - * encoding编码问题 + * encoding编码问题(springBoot默认已经配置好) * * @return */ 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 1ab8b8e..57f2ac0 100644 --- a/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java +++ b/boot-web/src/main/java/com/xwbing/configuration/DispatcherServletConfig.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; /** - * 说明: servlet配置 + * 说明: servlet上下文配置 * 项目名称: boot-module-demo * 创建时间: 2017/5/10 16:36 * 作者: xiangwb