diff --git a/src/apis/vote.js b/src/apis/vote.js
index 0af58b4..83c4e96 100644
--- a/src/apis/vote.js
+++ b/src/apis/vote.js
@@ -1,10 +1,4 @@
 import { request } from "@/utils/request";
-
-<<<<<<< HEAD
-export const apiGetVote = (articleId) => request.get('/vote/getVote', {params:{articleId}})
+export const apiGetVote = async (articleId) => request.get('/vote/getVote', {params:{articleId}})
 export const apiAddVoteRecord = async (record) => request.post(`/vote/addRecord`,record)
-=======
-export const apiGetVote = async (articleId) => request.get('/vote/getVote', articleId)
-export const apiAddVoteRecord = async (voteRecord) => request.post(`/vote/addRecord`,voteRecord)
->>>>>>> 61c1be8fc3f16e67b1596e0fd783905fea416051
 export const apiGetVoteIndex = async(userId,voteId) => request.get(`/vote/getIndex?userId=${userId}&voteId=${voteId}`)
\ No newline at end of file