From 76beae6bfcc30a788f44935fbd8959df630991b1 Mon Sep 17 00:00:00 2001
From: "youHong.ai" <774495953@qq.com>
Date: Thu, 8 Dec 2022 15:36:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6TestOrganization=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/youhong/ai/pcn/TestOrganization.java | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/youhong/ai/pcn/TestOrganization.java b/src/test/java/youhong/ai/pcn/TestOrganization.java
index 794129e..60c6f09 100644
--- a/src/test/java/youhong/ai/pcn/TestOrganization.java
+++ b/src/test/java/youhong/ai/pcn/TestOrganization.java
@@ -222,9 +222,4 @@ public class TestOrganization extends BaseTest {
         List<OrgChartNodeVo> orgChartTree = orgChartService.getOrgChartTree(user);
         System.out.println(JSON.toJSONString(orgChartTree));
     }
-
-<<<<<<< HEAD
-=======
-
->>>>>>> df1e8bb8c13ef138291cbf85631880cd9e5505c8
 }