diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index b56656b..a2be56f 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -81,7 +81,6 @@ const getAdminData = async function () {
     console.log('请求失败', error)
   }
 }
-<<<<<<< HEAD
 const viewRole =ref([])
 const getRolePermission = async function(){
     const result = await request({
@@ -93,10 +92,6 @@ const getRolePermission = async function(){
     viewRole.value = collectIds(result.data)
     console.log('result111',viewRole.value);
 }
-=======
-
-
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 // 编辑用户权限对象
 const permissionEditObj = ref({
   checkedKeys: [],