zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:冲突

Browse Source
This commit is contained in:
dzc committed 2025-01-21 17:31:19 +08:00
1 parent 99e13cf104
commit 4d589c2a9f
1 file changed
+1 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/views/admin/system/user/face-manage.vue
+1 -6
View File
@@ -26,15 +26,10 @@
label="操作" label="操作"
> >
<template #default="{ row }"> <template #default="{ row }">
<<<<<<< HEAD
<el-button v-auth="'userFace_sysUserFace_edit'" link type="primary" @click="editFace(row)"> <el-button v-auth="'userFace_sysUserFace_edit'" link type="primary" @click="editFace(row)">
<Icon icon="ep:edit" />修改 修改
</el-button> </el-button>
<el-button v-auth="'userFace_sysUserFace_del'" link type="danger" @click="delFace(row)"> 删除 </el-button> <el-button v-auth="'userFace_sysUserFace_del'" link type="danger" @click="delFace(row)"> 删除 </el-button>
=======
<el-button link type="primary" @click="editFace(row)">修改</el-button>
<el-button link type="danger" @click="delFace(row)">删除</el-button>
>>>>>>> 8cfb59e9a6321865edc4426d8f37304c734f1b05
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>