From a3a0d8a83e538efc6cf27865e5a33bf26e958ff7 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 25 九月 2025 09:37:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/ChangeDetailVO.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ChangeDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ChangeDetailVO.java index ffc479d..d55754c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ChangeDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ChangeDetailVO.java @@ -14,7 +14,8 @@ @Data @ApiModel(value = "资产变更审批详情返回VO") public class ChangeDetailVO implements Serializable { - + @ApiModelProperty(value = "是否需要签名 0-否,1-是") + private Boolean signFlag; @ApiModelProperty(value = "领用人") private String userName; @ApiModelProperty(value = "领用部门") @@ -38,8 +39,7 @@ private String warehouseName; @ApiModelProperty(value = "地址") private String address; - @ApiModelProperty(value = "领用资产列表") - private PageInfo<ChangeListVO> grabListVOPageInfo; + @ApiModelProperty(value = "审批流程") private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS; -- Gitblit v1.7.1