diff --git a/gold-system/src/views/workspace/index.vue b/gold-system/src/views/workspace/index.vue
index 9377a6a..29e6047 100644
--- a/gold-system/src/views/workspace/index.vue
+++ b/gold-system/src/views/workspace/index.vue
@@ -89,29 +89,10 @@ const get = async function () {
     getAreaRank();
     getMiddleBar();
     // 发送POST请求
-<<<<<<< HEAD
     const result1 = await API.post("/hwjb/statistics/getSumCoin", {});
     const result2 = await API.post("/hwjb/statistics/a", {});
     const result3 = await API.post("/hwjb/statistics/getYearConsumeCoin", {});
     const result4 = await API.post("/hwjb/statistics/getDayConsumeCoin", {});
-=======
-    const result1 = await API.post(
-      "http://192.168.8.93:10010/statistics/getSumCoin",
-      {}
-    );
-    const result2 = await API.post(
-      "http://192.168.8.93:10010/statistics/a",
-      {}
-    );
-    const result3 = await API.post(
-      "http://192.168.8.93:10010/statistics/getYearConsumeCoin",
-      {}
-    );
-    const result4 = await API.post(
-      "http://192.168.8.93:10010/statistics/getDayConsumeCoin",
-      {}
-    );
->>>>>>> Hongxilin
     // const result5 = await API.post(
     //   "http://192.168.8.93:10010/statistics/getMediumAreaPay",
     //   {}
@@ -129,14 +110,7 @@ const get = async function () {
     //   "http://192.168.8.93:10010/statistics/getMediuConsumeCoin",
     //   {}
     // );
-<<<<<<< HEAD
     const result9 = await API.post("/hwjb/statistics/b", {});
-=======
-    const result9 = await API.post(
-      "http://192.168.8.93:10010/statistics/b",
-      {}
-    );
->>>>>>> Hongxilin
 
     // 将响应结果存储到响应式数据中
     getSumCoin.value = result1.data;
@@ -379,11 +353,7 @@ const get = async function () {
 // 获取中间柱状图数据
 const getMiddleBar = async function () {
   const result = await API.post(
-<<<<<<< HEAD
     "hwjb/statistics/getCoinTime",
-=======
-    "http://192.168.8.93:10010/statistics/getCoinTime",
->>>>>>> Hongxilin
     getMiddleBarObj.value
   );