From 10f6e465c9753ff99099a22aabe72ede4e25eab7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 13:59:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 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 10c6515..04b89c9 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
@@ -30,6 +30,7 @@
private String applicantName;
@ApiModelProperty(value = "申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applicationDate;
@ApiModelProperty(value = "入库备注")
@@ -45,22 +46,11 @@
private Integer assetTypeId;
@ApiModelProperty(value = "入库类型 0-正常入库")
- private Boolean storageType;
+ private Integer storageType;
@ApiModelProperty(value = "入库日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate storageTime;
-
- @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
- private Integer addressType;
-
- @ApiModelProperty(value = "使用部门/位置名称")
- private String useDeptName;
-
- @ApiModelProperty(value = "仓库名称")
- private String warehouseName;
-
- @ApiModelProperty(value = "所在位置")
- private String address;
@ApiModelProperty(value = "房产资产明细列表（按保存展开后的一条资产记录对应一条明细）")
private List<PropertyAssetItemVO> assetItems;
@@ -150,8 +140,8 @@
@ApiModelProperty(value = "安置情况")
private String resettlementSituation;
- @ApiModelProperty(value = "是否抵押：0-否，1-是")
- private Integer mortgaged;
+ @ApiModelProperty(value = "是否抵押：否，是")
+ private String mortgaged;
@ApiModelProperty(value = "承租方")
private String tenantName;
@@ -166,5 +156,17 @@
@ApiModelProperty(value = "租赁期限止")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate leaseEndDate;
+
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
+
+ @ApiModelProperty(value = "使用部门/位置名称")
+ private String useDeptName;
+
+ @ApiModelProperty(value = "仓库名称")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
}
}
--
Gitblit v1.7.1