Merge remote-tracking branch 'origin/5.2' into 5.2

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

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>