ecology
/
ebu_ecology_dev1
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

合并TestOrganization冲突

main
youHong.ai 2022-12-08 15:36:44 +08:00
parent 72f8bca9aa
commit 76beae6bfc
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/java/youhong/ai/pcn/TestOrganization.java
View File

@ -222,9 +222,4 @@ public class TestOrganization extends BaseTest {
List<OrgChartNodeVo> orgChartTree = orgChartService.getOrgChartTree(user); List<OrgChartNodeVo> orgChartTree = orgChartService.getOrgChartTree(user);
System.out.println(JSON.toJSONString(orgChartTree)); System.out.println(JSON.toJSONString(orgChartTree));
} }
<<<<<<< HEAD
=======
>>>>>>> df1e8bb8c13ef138291cbf85631880cd9e5505c8
} }