Merge remote-tracking branch 'origin/master'

mitao

1 天以前 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b

 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;