冲突解决

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
 }
 
 // 仅对“异常群体模块”生效：时间变化时强制重绘一次