From 2afa20426193868ab45e0357c428f85deb8ee564 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期二, 28 五月 2024 09:34:58 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~qirong/qyksxt-admin

---
 src/views/education/subject/list.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/education/subject/list.vue b/src/views/education/subject/list.vue
index 9299e88..092f6d3 100644
--- a/src/views/education/subject/list.vue
+++ b/src/views/education/subject/list.vue
@@ -16,8 +16,8 @@
     </el-form>
 
     <el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row style="width: 100%">
-      <el-table-column prop="name" label="璇剧洰"/>
-<!--      <el-table-column prop="levelName" label="閮ㄩ棬" />-->
+      <el-table-column prop="name" label="璇剧洰鍚嶇О"/>
+      <el-table-column prop="deptNames" label="鎵�灞為儴闂�" />
       <el-table-column width="220px" label="鎿嶄綔" align="center">
         <template slot-scope="{row}">
           <router-link :to="{path:'/education/subject/edit', query:{id:row.id}}" class="link-left">

--
Gitblit v1.8.0