Merge remote-tracking branch 'origin/master'

# Conflicts:
#	doc/5.2-patch.sql

src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java

@@ -108,7 +108,6 @@ public class CategoryBizImpl extends BaseBizImpl<ICategoryDao, CategoryEntity> i
 		//保存链接地址
 		String path=ObjectUtil.isNotNull(parentCategory)?parentCategory.getCategoryPath():"";
 		categoryEntity.setCategoryPath( path+"/" + categoryEntity.getCategoryPinyin());
-		removeVirgule(categoryEntity);
 		setTopId(categoryEntity);
 		super.updateById(categoryEntity);
 	}
@@ -146,7 +145,6 @@ public class CategoryBizImpl extends BaseBizImpl<ICategoryDao, CategoryEntity> i
 			//判断是否有parentIds
 			x.setCategoryPath(path+"/"+x.getCategoryPinyin());
 			//去除多余的/符号
-			removeVirgule(x);
 			super.updateEntity(x);
 			setChildParentId(x);
 		});
@@ -167,20 +165,10 @@ public class CategoryBizImpl extends BaseBizImpl<ICategoryDao, CategoryEntity> i
 	}
 		setParentLeaf(entity);
 		setTopId(entity);
-		removeVirgule(entity);
 		super.updateById(entity);
 		setChildParentId(entity);
 	}
 
-	/**去除多余的/符号
-	 * @param entity
-	 */
-	private void removeVirgule(CategoryEntity entity) {
-
-		if (entity.getCategoryPath().startsWith("/")) {
-			entity.setCategoryPath(entity.getCategoryPath().substring(1));
-		}
-	}
 
 	@Override
 	public void update(CategoryEntity entity) {

src/main/webapp/WEB-INF/manager/cms/category/index.ftl

@@ -31,7 +31,7 @@
 					{{emptyText}}
 				</template>
 				<el-table-column type="selection" width="40"></el-table-column>
-				<el-table-column label="编号" width="120" prop="id">
+				<el-table-column label="编号" width="220" prop="id">
 					<template slot='header'>编号
 						<el-popover placement="top-start" title="提示" trigger="hover" >
 							<a href="http://doc.mingsoft.net/plugs-cms/biao-qian/lan-mu-lie-biao-ms-channel.html" target="_blank">${'$'}{field.id}</a>

src/main/webapp/WEB-INF/manager/cms/content/main.ftl

@@ -60,7 +60,7 @@
                 {{emptyText}}
             </template>
             <el-table-column type="selection" width="40"></el-table-column>
-            <el-table-column label="编号" width="70" prop="id">
+            <el-table-column label="编号" width="200" prop="id">
                 <template slot='header'>编号
                     <el-popover placement="top-start" title="提示" trigger="hover" >
                         <a href="http://doc.mingsoft.net/plugs-cms/biao-qian/wen-zhang-lie-biao-ms-arclist.html" target="_blank">${'$'}{field.id}</a>