From ed571ea38d8f0fc362ca97ce541d84573028c0f3 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 13 Dec 2022 18:33:51 +0800
Subject: [PATCH 1/2] init

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

diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue
index d7cea1c..7e396d1 100644
--- a/src/views/roadmap/LearnPath.vue
+++ b/src/views/roadmap/LearnPath.vue
@@ -100,12 +100,7 @@
                 </template>
               </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
               #default="scope"
               align="center"

From 56875228a29425eeb623473cb3c41a1354082b79 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Tue, 13 Dec 2022 18:36:18 +0800
Subject: [PATCH 2/2] init

---
 src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/App.vue b/src/App.vue
index 8ff28f4..4aa717e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,6 +34,7 @@ export default defineComponent({
     const router = useRouter();
     const route = useRoute();
     console.log("router", router.getRoutes(), route);
+    console.log(import.meta.env.DEV)
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });