From 306b1433c6a4d1fcce6871d94dc47af8e6f550cc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 30 五月 2024 15:50:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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