Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/tenant/main/policy/index.vue

@@ -76,7 +76,7 @@
           <!--自定义列-->
           <template slot="labelName" slot-scope="{ row }">
             <el-tooltip effect="dark" placement="top">
-              <div slot="content" v-for="(item, index) in row.labelNameArr" :key="index">{{ item }}<br /></div>
+              <div slot="content" >{{ row.labelName }}<br /></div>
               <div>{{ row.labelName | ellipsis }}</div>
             </el-tooltip>
           </template>