Merge remote-tracking branch 'origin/master'

tangzy

2021-11-05 98f8d438a976d73e7c4f6434efc8867ebe2a07a5

 src/main/java/org/springblade/modules/jurisdiction/service/impl/JurisdictionServiceImpl.java

@@ -86,6 +86,11 @@
   }

   @Override
   public List<JurisdictionVO> lazyTreeJu() {
      return baseMapper.lazyTreeJu();
   }

   @Override
   public List<JurisdictionVO> lazyTrees() {
      return  ForestNodeMerger.merge(baseMapper.lazyTrees());
   }