Merge remote-tracking branch 'origin/master'

lin

2024-03-16 6195b0dadf2a2d9d433d9059a20a53b702297bee

 src/main/java/org/springblade/modules/system/wrapper/DeptWrapper.java

@@ -70,6 +70,7 @@
      List<DeptVO> collect = list.stream().peek(dept -> {
         String category = DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory());
         Objects.requireNonNull(dept).setDeptCategoryName(category);
         Objects.requireNonNull(dept).setName(dept.getDeptName());
      }).collect(Collectors.toList());
      return ForestNodeMerger.merge(collect);
   }