From 206c1338ae6f5100cb408fb02a2095e211c0521f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:03 +0800
Subject: [PATCH] 资产入库联调修改
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePropertyDetailVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..22421c0 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,9 +46,10 @@
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-录入地址")
@@ -150,8 +152,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