From 8343cb5272cfb37edeb9767d8bcc5fc107be3874 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 23 九月 2025 20:59:18 +0800
Subject: [PATCH] 资产借用归还接口
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java
index a3eea4e..6cc9e09 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationAssetDetailVO.java
@@ -1,7 +1,6 @@
package com.ruoyi.system.vo.asset;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.system.model.OaApprovalApplicationAssetItem;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -42,7 +41,7 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate applicationDate;
- @ApiModelProperty(value = "事由/原因/说明")
+ @ApiModelProperty(value = "事由/原因/说明/备注")
private String applicationReason;
@ApiModelProperty(value = "审批状态 0-草稿，1-待审批，2-审批通过，3-审批拒绝 ，4-已撤回")
@@ -61,9 +60,11 @@
private Integer assetTypeId;
@ApiModelProperty(value = "领用/借用日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDate operateTime;
@ApiModelProperty(value = "预计退还日期")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDate expectReturnDate;
@ApiModelProperty(value = "操作类型 0-领用，1-借用，2-归还")
@@ -73,6 +74,6 @@
private Integer borrowApplicationId;
@ApiModelProperty("关联资产项列表")
- private List<OaApprovalApplicationAssetItem> items;
+ private List<AssetMainVO> items;
}
--
Gitblit v1.7.1