Merge branch 'dev' of https://git.yingcaibx.com/tl/api into dev

src/main/java/com/xjrsoft/module/concat/controller/ConcatController.java

@@ -41,7 +41,7 @@ public class ConcatController {
     @ApiOperation(value="教师通讯录")
     @SaCheckPermission("room:detail")
     public RT<List<ConcatTreeVo>> list(ConcatTreeDto dto) throws Exception {
-        Long parentId = 0L;
+        Long parentId = 1684107782861680000L;
         if(dto.getDeptId() != null){
             parentId = dto.getDeptId();
         }