From b84fc1807a6ce71f4d10cdb10da186abc5dcc173 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 19 九月 2025 19:37:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStorageVehicleDTO.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 ec0146a..73e8116 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;
@@ -60,13 +64,13 @@
@ApiModelProperty(value = "使用年限（年）")
private Integer usefulLife;
- @ApiModelProperty(value = "权属单位/部门ID")
- private Integer ownershipDeptId;
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownershipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
- @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ @ApiModelProperty(value = "使用/位置类型 0-部门，1-仓库，2-录入地址")
private Integer addressType;
@ApiModelProperty(value = "使用部门/位置名称")
--
Gitblit v1.7.1