Merge branch 'master' into wxlNew

src/views/contentManager/index.vue

@@ -43,7 +43,7 @@
           <knowledge v-if="activeStatus[6]" />
         </el-tab-pane>
         <el-tab-pane label="广告管理"
-                     v-if="permissionList.knowledge"
+                     v-if="permissionList.advert"
                      name="7">
           <advert v-if="activeStatus[7]" />
         </el-tab-pane>