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/OaApprovalApplicationStorageGeneralDetailVO.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
index a4edb80..291c6e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.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;
@@ -29,6 +30,7 @@
private String applicantName;
@ApiModelProperty(value = "申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applicationDate;
@ApiModelProperty(value = "入库备注")
@@ -44,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<GeneralAssetItemVO> assetItems;
@@ -114,5 +105,17 @@
@ApiModelProperty(value = "入账金额")
private BigDecimal accountingAmount;
+
+ @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