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

feat:合并

Browse Source
This commit is contained in:
lixg
2022-12-13 18:22:55 +08:00
parent 9ea92e9717 c75d463c40
commit 761ea6bb6d
14 changed files with 1249 additions and 1159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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