From 652db871507244a5838fc6b36d9b9771b527ad61 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 25 九月 2025 11:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 6b333a3..cf41d80 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
@@ -8,14 +8,14 @@
import java.io.Serializable;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
@Data
@ApiModel(value = "资产入库审批详情返回VO")
public class StorageDetailVO implements Serializable {
-
+ @ApiModelProperty(value = "是否需要签名 0-否，1-是")
+ private Boolean signFlag;
@ApiModelProperty(value = "附件地址，多个使用英文逗号拼接")
private String attachmentUrl;
@@ -23,6 +23,8 @@
private Integer approvalApplicationId;
@ApiModelProperty(value = "标题")
private String title;
+ @ApiModelProperty(value = "资产类型名称")
+ private String assetTypeName;
@ApiModelProperty(value = "入库类型 0-正常入库")
private Integer storageType;
@ApiModelProperty(value = "入库日期")
@@ -32,7 +34,7 @@
private String remarks;
@ApiModelProperty(value = "采购物品清单")
- private PageInfo<GrabListVO> grabListVOPageInfo;
+ private PageInfo<StorageListVO> grabListVOPageInfo;
@ApiModelProperty(value = "审批流程")
private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;
--
Gitblit v1.7.1