diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index f68c6b2..84b34e2 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -787,14 +787,22 @@ const EdithandleMarketChange = (values) => {
   console.log('看看现在的地区',permissionEditObj.value.market);
   
 };
+<<<<<<< HEAD
 // const handleCheckChange = (checkedNodes, { checkedKeys }) => {
 //   addRole.value.checkedKeys = checkedKeys;
 // }
+=======
+
+>>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 // 处理编辑角色权限时的勾选事件
 const handleEditRolePermissionCheck = (checkedNodes, { checkedKeys }) => {
   permissionEditRoleObj.value.checkedKeys = checkedKeys;
 };
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 const handleCheckChange = async (checkedNodes, checkedInfo) => {
   const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo;
 
@@ -1430,6 +1438,10 @@ onMounted(async function () {
     </template>
   </el-dialog>
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
   <!-- 編輯角色彈窗 -->
    <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
     <template #footer>