From 4ad572c4e51e44e3134def3c70879b3a698ab1d8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 九月 2025 19:56:16 +0800
Subject: [PATCH] 资产变更

---
 ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStoragePropertyDTO.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStoragePropertyDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStoragePropertyDTO.java
index d74064c..02e2cd3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStoragePropertyDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/asset/OaApprovalApplicationStoragePropertyDTO.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,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 = "使用部门/位置名称")
@@ -135,8 +139,8 @@
         @ApiModelProperty(value = "安置情况")
         private String resettlementSituation;
 
-        @ApiModelProperty(value = "是否抵押:0-否,1-是")
-        private Boolean isMortgaged;
+        @ApiModelProperty(value = "是否抵押:否,是")
+        private String mortgaged;
 
         @ApiModelProperty(value = "承租方")
         private String tenantName;

--
Gitblit v1.7.1