Merge remote-tracking branch 'origin/master'

Administrator

2021-09-18 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944

 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());
   }