Merge remote-tracking branch 'origin/jtdev' into jtdev

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.java

@@ -52,7 +52,7 @@
    */
   List<DeptVO> tree(String tenantId);

   List<DeptVO> treeByParentId(String parentId);
   List<DeptVO> treeByParentId(List<String> parentIds);

   /**
    * 懒加载获取树形节点
@@ -61,7 +61,7 @@
    * @param parentId
    * @return
    */
   List<DeptVO> lazyTree(String tenantId, Long parentId);
   List<DeptVO> lazyTree(String tenantId, List<Long> parentId);

   /**
    * 获取部门名