From 984493c8364b158ccaa92f594640bc9ada347d27 Mon Sep 17 00:00:00 2001
From: zq <136432190602163.com>
Date: Fri, 19 Dec 2025 15:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/super/Ranking/RankBatchList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/views/super/Ranking/RankBatchList.vue b/src/views/super/Ranking/RankBatchList.vue
index da433c3..1e9f01f 100644
--- a/src/views/super/Ranking/RankBatchList.vue
+++ b/src/views/super/Ranking/RankBatchList.vue
@@ -176,10 +176,6 @@ import CustomDropdown from '@/components/CustomDropdown.vue';
 import SvgIcon from '@/components/SvgIcon.vue';
 import GuipToolTip from '@/components/GuipToolTip.vue';
 import {getDate,getFormattedDate} from "@/utils/common.js"
-<<<<<<< HEAD
-
-=======
->>>>>>> b3837ab9b64a6bcf6f0c21885dbbe52d14501704
 // import HoverImage from '@/components/super/HoverImage.vue';
 export default {
     name: 'rank_batch_list',