From 5838faa4b93c19e544db98b38624a78a27a6ccda Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Mon, 5 Apr 2021 21:34:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9C=81/=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/views/system/admin.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test_client/src/views/system/admin.vue b/test_client/src/views/system/admin.vue
index 7000aa7..ccfbbf0 100644
--- a/test_client/src/views/system/admin.vue
+++ b/test_client/src/views/system/admin.vue
@@ -24,11 +24,11 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="所属省份">
-            <template slot-scope="scope">{{ scope.row.pname }}</template>
-          </el-table-column>
-          <el-table-column label="所属单位">
-            <template slot-scope="scope">{{ scope.row.bcompany_name }}</template>
+          <el-table-column label="所属省份/单位">
+            <template slot-scope="scope">
+              {{ scope.row.pname }}
+              {{ scope.row.bcompany_name }}
+            </template>
           </el-table-column>
           <el-table-column label="创建日期">
             <template slot-scope="scope">