feat:update

src/views/bill/billHome/ResourceLibrarySection.vue

@@ -283,11 +283,7 @@ import cyyIcon from "@/assets/icons/cyy.png";
 import ghdIcon from "@/assets/icons/ghd.png";
 import mzdIcon from "@/assets/icons/mzd.png";
 import { ElMessage } from "element-plus";
-<<<<<<< HEAD
-import { goToDataCountryBill } from "@/utils/goToPage1";
-=======
 import { goToDataCountryBill } from "@/utils/goToPage/methods/dataLibrary";
->>>>>>> 72613fb4e5b1d946b92e1ac7d2f482ed5a91304c
 
 const router = useRouter();
 

src/views/bill/billHome/index.vue

@@ -322,11 +322,7 @@ import iconILetter from "./assets/icons/icon-iLetter.png";
 
 import { ElMessage } from "element-plus";
 import { useGotoNewsDetail } from "@/router/modules/news";
-<<<<<<< HEAD
-import { goToBill } from "@/utils/goToPage1";
-=======
 import { goToBill } from "@/utils/goToPage/methods/bill";
->>>>>>> 72613fb4e5b1d946b92e1ac7d2f482ed5a91304c
 
 // 跳转人物主页（MessageBubble 的 person-click 传入整条列表项，需取 personId）
 const handleClickToCharacter = async item => {