Merge remote-tracking branch 'origin/master'

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

@@ -9,7 +9,7 @@
 <div id="index"  v-cloak>
 	<!--左侧-->
 	<el-container class="index-menu">
-		<div class="left-tree">
+		<div class="left-tree" style="position:relative;">
 			<el-scrollbar style="height: 100%;">
 				<el-tree :indent="5" v-loading="loading" highlight-current :expand-on-click-node="false" default-expand-all :empty-text="emptyText" :data="treeData" :props="defaultProps" @node-click="handleNodeClick" style="padding: 10px;height: 100%;"></el-tree>
 			</el-scrollbar>
@@ -123,4 +123,5 @@
 	body{
 		overflow: hidden;
 	}
+
 </style>