diff --git a/src/api/auth/platform.js b/src/api/auth/platform.js
index e1eecad..3badeaa 100644
--- a/src/api/auth/platform.js
+++ b/src/api/auth/platform.js
@@ -25,6 +25,7 @@ export function deletePlatform(data) {
     });
 } 
 
+<<<<<<< HEAD
 export function linkPlatform(query) {
     return axios({
         url: "/udims/platform/link",
@@ -32,5 +33,7 @@ export function linkPlatform(query) {
         data: query
     });
 }
+=======
+>>>>>>> c650990e88803f1202c54d7765a88f360286269c
 
 
diff --git a/src/views/userManage/platform.vue b/src/views/userManage/platform.vue
index 4e24555..b84ce0b 100644
--- a/src/views/userManage/platform.vue
+++ b/src/views/userManage/platform.vue
@@ -235,10 +235,14 @@ export default {
       this.formVisible = true;
     },
 
+<<<<<<< HEAD
     handleCurrentChange(val) {
       this.query.page = val;
       this.getList();
     },
+=======
+
+>>>>>>> c650990e88803f1202c54d7765a88f360286269c
 
     deleteDialog(row) {
       this.$confirm("确认删除该自助平台信息?", "提示", {