From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 09 十月 2025 11:56:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java index 4d853b7..1288cd9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java @@ -14,7 +14,8 @@ @ApiModel(value = "资产入库审批详情返回VO") public class StorageDetailVO implements Serializable { - + @ApiModelProperty(value = "是否需要签名 0-否,1-是") + private Boolean signFlag; @ApiModelProperty(value = "附件地址,多个使用英文逗号拼接") private String attachmentUrl; @@ -22,6 +23,8 @@ private Integer approvalApplicationId; @ApiModelProperty(value = "标题") private String title; + @ApiModelProperty(value = "资产类型名称") + private String assetTypeName; @ApiModelProperty(value = "入库类型 0-正常入库") private Integer storageType; @ApiModelProperty(value = "入库日期") @@ -29,7 +32,8 @@ private LocalDate storageTime; @ApiModelProperty(value = "入库备注") private String remarks; - + @ApiModelProperty(value = "是否可以审批") + private Boolean isAudit; @ApiModelProperty(value = "采购物品清单") private PageInfo<StorageListVO> grabListVOPageInfo; @ApiModelProperty(value = "审批流程") -- Gitblit v1.7.1