From dba5100257df4ff99e88e41a58dd20a2e4543556 Mon Sep 17 00:00:00 2001
From: wujj <1027418825@qq.com>
Date: Wed, 2 Dec 2020 18:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/5.2-patch.sql                                | 3 ++-
 src/main/java/net/mingsoft/config/WebConfig.java | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql
index d5a643e9..1476ff35 100644
--- a/doc/5.2-patch.sql
+++ b/doc/5.2-patch.sql
@@ -80,7 +80,8 @@ DROP COLUMN `app_id`;
 ALTER TABLE `cms_category`
 MODIFY COLUMN `category_id` bigint(20) ZEROFILL NULL DEFAULT NULL COMMENT '所属栏目' AFTER `id`,
 MODIFY COLUMN `mdiy_model_id` int(11) NULL DEFAULT NULL COMMENT '栏目管理的内容模型id' AFTER `dict_id`;
-
+ALTER TABLE `cms_category`
+CHANGE COLUMN `category_parent_id` `category_parent_ids` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '父类型编号，多个id逗号' AFTER `mdiy_model_id`;
 
 ALTER TABLE `cms_content`
 CHANGE COLUMN `content_category_id` `category_id` bigint(20) UNSIGNED NULL COMMENT '所属栏目' AFTER `id`;
diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java
index f33b1643..e67d967f 100644
--- a/src/main/java/net/mingsoft/config/WebConfig.java
+++ b/src/main/java/net/mingsoft/config/WebConfig.java
@@ -154,6 +154,10 @@ public class WebConfig implements WebMvcConfigurer {
 		return pool;
 	}
 
+	/**
+	 * 国际化配置拦截
+	 * @return
+	 */
 	@Bean
 	public MSLocaleResolver localeResolver(){
 		return new MSLocaleResolver();