From baed9b68c8cb6b693d3c010f039d2c55bf242e0e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 十月 2025 18:09:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
index 291c6e8..3b793d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
@@ -29,6 +29,9 @@
@ApiModelProperty(value = "申请人姓名")
private String applicantName;
+ @ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
+ private Integer approvalStatus;
+
@ApiModelProperty(value = "申请日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applicationDate;
@@ -58,11 +61,18 @@
@Data
@ApiModel("通用资产明细VO")
public static class GeneralAssetItemVO implements Serializable {
+
+ @ApiModelProperty(value = "资产主表ID")
+ private Integer id;
+
@ApiModelProperty(value = "资产原编码")
private String assetOriginalCode;
@ApiModelProperty(value = "资产名称")
private String assetName;
+
+ @ApiModelProperty(value = "类别")
+ private String category;
@ApiModelProperty(value = "规格型号")
private String specificationModel;
@@ -71,7 +81,7 @@
private String measurementUnit;
@ApiModelProperty(value = "数量")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
private BigDecimal unitPrice;
@@ -80,7 +90,7 @@
private Integer usefulLife;
@ApiModelProperty(value = "权属单位/部门名称")
- private String ownerShipDeptName;
+ private String ownershipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
--
Gitblit v1.7.1