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/dto/asset/OaApprovalApplicationStoragePropertyDTO.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 f38430e..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
@@ -55,7 +55,7 @@
@ApiModelProperty(value = "数量")
@NotNull(message = "数量不能为空")
- private BigDecimal quantity;
+ private Integer quantity;
@ApiModelProperty(value = "单价")
@NotNull(message = "单价不能为空")
@@ -139,8 +139,8 @@
@ApiModelProperty(value = "安置情况")
private String resettlementSituation;
- @ApiModelProperty(value = "是否抵押：0-否，1-是")
- private Integer mortgaged;
+ @ApiModelProperty(value = "是否抵押：否，是")
+ private String mortgaged;
@ApiModelProperty(value = "承租方")
private String tenantName;
--
Gitblit v1.7.1