From 03587b58b343956f910a653c37b9a7bcd84e4af9 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 19 九月 2025 18:54:03 +0800
Subject: [PATCH] 资产管理-资产领用列表 阿里云OSS文件上传
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
index e1e2179..10c6515 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.vo.asset;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -88,8 +89,8 @@
@ApiModelProperty(value = "使用年限（年）")
private Integer usefulLife;
- @ApiModelProperty(value = "权属单位/部门ID")
- private Integer ownershipDeptId;
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownerShipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
@@ -150,7 +151,7 @@
private String resettlementSituation;
@ApiModelProperty(value = "是否抵押：0-否，1-是")
- private Boolean isMortgaged;
+ private Integer mortgaged;
@ApiModelProperty(value = "承租方")
private String tenantName;
@@ -159,10 +160,11 @@
private BigDecimal rentalAmount;
@ApiModelProperty(value = "租赁期限起")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate leaseStartDate;
@ApiModelProperty(value = "租赁期限止")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate leaseEndDate;
}
}
-
--
Gitblit v1.7.1