From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java
index e0d5a2a..f6533bd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java
@@ -42,6 +42,10 @@
@NotBlank(message = "资产名称不能为空")
private String assetName;
+ @ApiModelProperty(value = "类别")
+ @NotBlank(message = "类别不能为空")
+ private String category;
+
@ApiModelProperty(value = "规格型号")
private String specificationModel;
@@ -51,7 +55,7 @@
@ApiModelProperty(value = "数量")
@NotNull(message = "数量不能为空")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
@NotNull(message = "单价不能为空")
@@ -60,17 +64,17 @@
@ApiModelProperty(value = "使用年限（年）")
private Integer usefulLife;
- @ApiModelProperty(value = "权属单位/部门ID")
- private Integer ownershipDeptId;
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownershipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
- @ApiModelProperty(value = "使用部门/位置ID")
- private Integer useDeptId;
+ @ApiModelProperty(value = "使用/位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
- @ApiModelProperty(value = "仓库ID")
- private Integer warehouseId;
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
@ApiModelProperty(value = "仓库名称")
private String warehouseName;
--
Gitblit v1.7.1