Merge remote-tracking branch 'origin/master'

linwei

2024-02-03 c50cce7ac8e4b0d1cd1d35feedfe479180ac03ae

 src/main/java/org/springblade/modules/system/service/impl/DictBizServiceImpl.java

@@ -52,8 +52,9 @@
public class DictBizServiceImpl extends ServiceImpl<DictBizMapper, DictBiz> implements IDictBizService {

   @Override
   public List<DictBizVO> tree() {
      return ForestNodeMerger.merge(baseMapper.tree());
   public List<DictBizVO> tree(String code) {
      List<DictBizVO> tree = baseMapper.tree(code);
      return ForestNodeMerger.merge(tree);
   }

   @Override