修改合并冲突

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',