From fd1c2ae992b8cf10c991fbdbfe85630a3d53fe73 Mon Sep 17 00:00:00 2001
From: duanhao <dh14779715518@163.com>
Date: Fri, 8 Aug 2025 17:49:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/GroupEvolution/component/groupGraph.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/GroupEvolution/component/groupGraph.vue b/src/views/GroupEvolution/component/groupGraph.vue
index d8eb961..b329fbb 100644
--- a/src/views/GroupEvolution/component/groupGraph.vue
+++ b/src/views/GroupEvolution/component/groupGraph.vue
@@ -191,7 +191,6 @@ const clusterAnalyze = () => {
     })
   })
   graphVis.autoGroupLayout(graphVis.nodes)
-<<<<<<< HEAD
 
   function handleGroupDiscoveryDiff() {
     console.log(storeId)
@@ -282,8 +281,6 @@ const clusterAnalyze = () => {
     ["anomalousGroup", () => handleAnomalousGroup()]
   ]).get(storeId)?.()
   // graphVis.selectedEdge(graphVis.links[0])
-=======
->>>>>>> b235c3aec5e4b61d56355d6ea6baa4dff02dede4
 }
 
 // 仅对“异常群体模块”生效：时间变化时强制重绘一次