hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-12 04:16:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat:合并冲突

Browse Source
This commit is contained in:
lixg
2022-12-13 18:30:16 +08:00
parent 761ea6bb6d
commit 5c47156e71
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/roadmap/LearnPath.vue
View File

@@ -101,11 +101,11 @@
</el-popover> </el-popover>
</el-table-column> </el-table-column>
<<<<<<< HEAD <el-table-column
<el-table-column align="center" prop="target" label="目标人群" /> align="center"
======= prop="organizationName"
<el-table-column align="center" prop="organizationName" label="归属组织"/> label="归属组织"
>>>>>>> c75d463c401f71da9db53014bf96eb14db8ab0d8 />
<el-table-column <el-table-column
#default="scope" #default="scope"
align="center" align="center"