From 379bd0084b647040df3ebae3f9c252172deeb182 Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Wed, 28 Oct 2020 15:33:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/mingsoft/cms/dao/IContentDao.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 18dcad9a..78b13c1b 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -219,7 +219,7 @@
 		</select>
 	<!--条件查询-->
 	<select id="query" resultMap="resultContentMap">
-		select ct.*,CONCAT("/html/",ct.app_id,category_path,"/",ct.id,".html") AS static_url from (
+		select ct.*,CONCAT('/html/',ct.app_id,category_path,'/',ct.id,'.html') AS static_url from (
 		select ct.*,cc.category_path from cms_content ct
 		join cms_category cc on ct.content_category_id=cc.id
 		<where>

From 1d2d13d859ea25847d65c15eecc1bee0704d598b Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Wed, 28 Oct 2020 15:40:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/5.2-patch.sql | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/5.2-patch.sql b/doc/5.2-patch.sql
index 3978876c..e3265eda 100644
--- a/doc/5.2-patch.sql
+++ b/doc/5.2-patch.sql
@@ -8,4 +8,7 @@ ALTER TABLE `mdiy_model`
 CHANGE COLUMN `model_app_id` `app_id`  int(11) NULL DEFAULT NULL COMMENT '应用编号' AFTER `model_json`;
 
 ALTER TABLE `mdiy_dict`
-ADD COLUMN `dict_enable`  varchar(11) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '启用状态' AFTER `is_child`;
\ No newline at end of file
+ADD COLUMN `dict_enable`  varchar(11) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '启用状态' AFTER `is_child`;
+
+ALTER TABLE `cms_category` ADD COLUMN `leaf`  bigint(1) NULL DEFAULT NULL COMMENT '是否是叶子节点' AFTER `category_pinyin`;
+ALTER TABLE `cms_category` ADD COLUMN `top_id`  int(11) NULL DEFAULT NULL COMMENT '顶级id' AFTER `leaf`;
\ No newline at end of file