From 974c47e125db2e17fb3531428fdad34025211496 Mon Sep 17 00:00:00 2001
From: liruiqiang <3151805288@qq.com>
Date: Fri, 27 Jun 2025 10:43:59 +0800
Subject: [PATCH] =?UTF-8?q?api/vote.js=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/vote.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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