Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/catalog/service/impl/CatalogServiceImpl.java

@@ -23,6 +23,7 @@
import org.springblade.modules.catalog.mapper.catalogMapper;
import org.springblade.modules.catalog.service.catalogService;
import org.springblade.modules.catalog.vo.catalogVO;
import org.springblade.modules.system.vo.DeptVO;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -93,7 +94,7 @@
    * @return
    */
   @Override
   public List<catalogVO> getBigTree() {
   public List<DeptVO> getBigTree() {
      return ForestNodeMerger.merge(baseMapper.getBigTree());
   }
}