Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/system/controller/DictBizController.java

@@ -75,8 +75,8 @@
   })
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "传入dict")
   public R<List<DictBizVO>> list(@ApiIgnore @RequestParam Map<String, Object> dict) {
      List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict, DictBiz.class).lambda().orderByAsc(DictBiz::getSort));
   public R<List<DictBizVO>> list(@ApiIgnore DictBiz dict) {
      List<DictBiz> list = dictService.list(Condition.getQueryWrapper(dict).lambda().orderByAsc(DictBiz::getSort));
      return R.data(DictBizWrapper.build().listNodeVO(list));
   }

@@ -161,7 +161,7 @@
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "获取字典", notes = "获取字典")
   public R<List<DictBiz>> dictionary(String code) {
      List<DictBiz> tree = dictService.getList(code);
      List<DictBiz> tree = dictService.getList(code,null);
      return R.data(tree);
   }

@@ -172,7 +172,7 @@
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "获取字典树", notes = "获取字典树")
   public R<List<DictBizVO>> dictionaryTree(String code) {
      List<DictBiz> tree = dictService.getList(code);
      List<DictBiz> tree = dictService.getList(code,null);
      return R.data(DictBizWrapper.build().listNodeVO(tree));
   }