代码合并解决冲突 bug修改

无关风月

4 天以前 e56c1cce484cd8df8c3373d4e2b5847d11b09abe

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

@@ -36,8 +36,7 @@
    @ApiModelProperty(value = "借用单据号")
    private String applicationCode;

    @ApiModelProperty(value = "借用资产列表")
    private PageInfo<BackListVO> backListVOPageInfo;

    @ApiModelProperty(value = "审批流程")
    private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;