Merge branch 'master' of http://124.223.211.244:8418/zianxin/biz-pc-cloud

# Conflicts:
#	src/views/admin/system/user/face-manage.vue

src/views/admin/system/user/face-manage.vue

@@ -26,10 +26,15 @@
 					label="操作"
 				>
 					<template #default="{ row }">
+<<<<<<< HEAD
 						<el-button v-auth="'userFace_sysUserFace_edit'" link type="primary" @click="editFace(row)">
 							<Icon icon="ep:edit" />修改
 						</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>
 				</el-table-column>
 			</el-table>