From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 九月 2025 16:51:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStorageGeneralDetailVO.java | 41 ++++++-----------------------------------
1 files changed, 6 insertions(+), 35 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 ec1cde5..bf8ec9c 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,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-录入地址")
@@ -88,8 +91,8 @@
@ApiModelProperty(value = "使用年限（年）")
private Integer usefulLife;
- @ApiModelProperty(value = "权属单位/部门ID")
- private Integer ownershipDeptId;
+ @ApiModelProperty(value = "权属单位/部门名称")
+ private String ownerShipDeptName;
@ApiModelProperty(value = "使用人")
private String userName;
@@ -114,37 +117,5 @@
@ApiModelProperty(value = "入账金额")
private BigDecimal accountingAmount;
-
- // 通用资产扩展表字段
- @ApiModelProperty(value = "供应商名称")
- private String supplierName;
-
- @ApiModelProperty(value = "采购日期")
- private LocalDate purchaseDate;
-
- @ApiModelProperty(value = "保修期（月）")
- private Integer warrantyPeriod;
-
- @ApiModelProperty(value = "保修到期日期")
- private LocalDate warrantyExpireDate;
-
- @ApiModelProperty(value = "折旧方法")
- private String depreciationMethod;
-
- @ApiModelProperty(value = "折旧率")
- private java.math.BigDecimal depreciationRate;
-
- @ApiModelProperty(value = "净值")
- private java.math.BigDecimal netValue;
-
- @ApiModelProperty(value = "维护周期（月）")
- private Integer maintenanceCycle;
-
- @ApiModelProperty(value = "上次维护日期")
- private LocalDate lastMaintenanceDate;
-
- @ApiModelProperty(value = "下次维护日期")
- private LocalDate nextMaintenanceDate;
}
}
-
--
Gitblit v1.7.1