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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

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

@@ -116,6 +116,18 @@
   }

   /**
    * 根据父级角色查询子角色
    * @param parentId
    * @return
    */
   @GetMapping("/treeByParentIdNew")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "树形结构", notes = "树形结构")
   public R<List<RoleVO>> treeByParentIdNew(String parentId) {
      List<RoleVO> tree = roleService.treeByParentIdNew(parentId);
      return R.data(tree);
   }
   /**
    * 获取指定角色树形结构
    */
   @GetMapping("/tree-by-id")