From b84fc1807a6ce71f4d10cdb10da186abc5dcc173 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 19 九月 2025 19:37:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/BorrowDetailVO.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BorrowDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BorrowDetailVO.java index ef68812..b8648ae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/BorrowDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/BorrowDetailVO.java @@ -32,8 +32,7 @@ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private LocalDate expectReturnDate; - @ApiModelProperty(value = "借用资产列表") - private PageInfo<BorrowListVO> borrowListVOPageInfo; + @ApiModelProperty(value = "审批流程") private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS; -- Gitblit v1.7.1