diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index ca906aa..76aaaee 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -778,9 +778,7 @@ const EdithandleMarketChange = (values) => {
     // 如果选择了总部，只保留总部
     permissionEditObj.value.market = ['总部'];
   }
-<<<<<<< HEAD
-  console.log('看看现在的地区', permissionEditObj.value.market);
-=======
+
   console.log('看看现在的地区',permissionEditObj.value.market);
   
 };
@@ -791,9 +789,7 @@ const handleCheckChange = (checkedNodes, { checkedKeys }) => {
 const handleEditRolePermissionCheck = (checkedNodes, { checkedKeys }) => {
   permissionEditRoleObj.value.checkedKeys = checkedKeys;
 };
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 
-};
 const handleCheckChange = async (checkedNodes, checkedInfo) => {
   const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo;
 
@@ -921,12 +917,12 @@ const confirmResetPassword = async function () {
   }
 }
 
-<<<<<<< HEAD
+
 // 取消重置密码
 const cancelResetPassword = function () {
   resetConfirmVisible.value = false
 }
-=======
+
 
 // 编辑角色对象
 const permissionEditRoleObj = ref({
@@ -1003,8 +999,6 @@ const permissionEditRole = async function () {
 };
 
 
-
-
 // 挂载
 onMounted(async function () {
   await get()
@@ -1014,7 +1008,6 @@ onMounted(async function () {
   await getAdminData()
 })
 
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 const Rolerules = reactive({
   roleName: [
     { required: true, message: '请输入角色名称', trigger: 'blur' },
@@ -1412,7 +1405,7 @@ onMounted(async function () {
       </div>
     </template>
   </el-dialog>
-<<<<<<< HEAD
+
   <!-- 重置密码确认弹窗 -->
   <el-dialog v-model="resetConfirmVisible" width="500px" :close-on-click-modal="false"
     :before-close="cancelResetPassword">
@@ -1436,8 +1429,6 @@ onMounted(async function () {
     </template>
   </el-dialog>
 
-=======
-
   <!-- 編輯角色彈窗 -->
    <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
     <template #footer>