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

guoshilong

2023-05-27 a2989e934129341e30d13a649ea01e008a95348f

 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/DictBizController.java

@@ -165,6 +165,17 @@
   }

   /**
    * 获取字典
    */
   @GetMapping("/dictionaryByParentId")
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "获取字典", notes = "获取字典")
   public R<List<DictBiz>> dictionaryByParentId(String code,Long parentId) {
      List<DictBiz> tree = dictService.getListByParentId(code,parentId);
      return R.data(tree);
   }

   /**
    * 获取字典树
    */
   @GetMapping("/dictionary-tree")