From 5c47156e71da7f5b76a3135ea72309b2b22b4a8d Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 13 Dec 2022 18:30:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/roadmap/LearnPath.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index d7cea1c..ea5c8dd 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -101,11 +101,11 @@
               </el-popover>
             </el-table-column>
 
-<<<<<<< HEAD
-            <el-table-column align="center" prop="target" label="目标人群" />
-=======
-            <el-table-column align="center" prop="organizationName" label="归属组织"/>
->>>>>>> c75d463c401f71da9db53014bf96eb14db8ab0d8
+            <el-table-column
+              align="center"
+              prop="organizationName"
+              label="归属组织"
+            />
             <el-table-column
               #default="scope"
               align="center"