From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/StorageDetailVO.java | 4 ++--
1 files changed, 2 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 6b333a3..651ec43 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
@@ -24,7 +24,7 @@
@ApiModelProperty(value = "标题")
private String title;
@ApiModelProperty(value = "入库类型 0-正常入库")
- private Integer storageType;
+ private Boolean storageType;
@ApiModelProperty(value = "入库日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate storageTime;
@@ -32,7 +32,7 @@
private String remarks;
@ApiModelProperty(value = "采购物品清单")
- private PageInfo<GrabListVO> grabListVOPageInfo;
+ private PageInfo<StorageListVO> grabListVOPageInfo;
@ApiModelProperty(value = "审批流程")
private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;
--
Gitblit v1.7.1