Merge remote-tracking branch 'origin/master'

无关风月

4 天以前 9398b7743fa976b016dfbb2b9cf4a04db340508e

 ruoyi-system/src/main/java/com/ruoyi/system/vo/BorrowDetailVO.java

@@ -33,7 +33,8 @@
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private LocalDate expectReturnDate;


    @ApiModelProperty(value = "是否可以审批")
    private Boolean isAudit;
    @ApiModelProperty(value = "审批流程")
    private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;