From e56c1cce484cd8df8c3373d4e2b5847d11b09abe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 14:08:10 +0800
Subject: [PATCH] 代码合并解决冲突 bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/PurchaseDetailVO.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/PurchaseDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/PurchaseDetailVO.java
index 64e63b6..0bcef3c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/PurchaseDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/PurchaseDetailVO.java
@@ -34,8 +34,7 @@
private String title;
@ApiModelProperty(value = "资产类型名称")
private String assetTypeName;
- @ApiModelProperty(value = "采购物品清单")
- private PageInfo<PurchaseListVO> purchaseListVOPageInfo;
+
@ApiModelProperty(value = "审批流程")
private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;
--
Gitblit v1.7.1