合并TestOrganization冲突

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
 }