From 45e035bfb4c196fd8c58946d560da69006de6689 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 15 十月 2025 19:11:36 +0800
Subject: [PATCH] 广告无形资产广告字段简写修改
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainPageVO.java | 89 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainPageVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainPageVO.java
index 03360cc..6ab5d90 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainPageVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/AssetMainPageVO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDate;
/**
@@ -40,5 +41,93 @@
@ApiModelProperty(value = "使用部门/位置")
private String useDeptOrLocation;
+
+ @ApiModelProperty(value = "审批申请记录ID")
+ private Integer approvalApplicationId;
+
+ @ApiModelProperty(value = "资产原编码")
+ private String assetOriginalCode;
+
+ @ApiModelProperty(value = "规格型号")
+ private String specificationModel;
+
+ @ApiModelProperty(value = "类别")
+ private String category;
+
+ @ApiModelProperty(value = "资产类别ID，关联asset_type表")
+ private Integer assetTypeId;
+
+ @ApiModelProperty(value = "类别名称（冗余字段）")
+ private String assetCategory;
+
+ @ApiModelProperty(value = "资产主类型：0-通用资产，1-房产资产，2-车辆资产")
+ private Integer assetMainType;
+
+ @ApiModelProperty(value = "计量单位")
+ private String measurementUnit;
+
+ @ApiModelProperty(value = "数量")
+ private Integer quantity;
+
+ @ApiModelProperty(value = "单价")
+ private BigDecimal unitPrice;
+
+ @ApiModelProperty(value = "总价值（数量*单价）")
+ private BigDecimal totalValue;
+
+ @ApiModelProperty(value = "使用年限（年）")
+ private Integer usefulLife;
+
+ @ApiModelProperty(value = "权属单位/部门ID")
+ private Integer ownershipDeptId;
+
+ @ApiModelProperty(value = "使用人")
+ private String userName;
+
+ @ApiModelProperty(value = "位置类型 0-部门，1-仓库，2-录入地址")
+ private Integer addressType;
+
+ @ApiModelProperty(value = "使用部门/位置ID")
+ private Integer useDeptId;
+
+ @ApiModelProperty(value = "仓库ID，关联warehouse表")
+ private Integer warehouseId;
+
+ @ApiModelProperty(value = "仓库名称（冗余字段）")
+ private String warehouseName;
+
+ @ApiModelProperty(value = "所在位置")
+ private String address;
+
+ @ApiModelProperty(value = "备注")
+ private String remarks;
+
+ @ApiModelProperty(value = "入账状态")
+ private String accountingStatus;
+
+ @ApiModelProperty(value = "入账时间")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate accountingDate;
+
+ @ApiModelProperty(value = "会计凭证号")
+ private String accountingVoucherNo;
+
+ @ApiModelProperty(value = "会计科目")
+ private String accountingSubject;
+
+ @ApiModelProperty(value = "入账金额")
+ private BigDecimal accountingAmount;
+
+ @ApiModelProperty(value = "附件URL列表（多个附件使用英文逗号拼接）")
+ private String attachmentUrls;
+
+ @ApiModelProperty(value = "是否被处置")
+ private Integer disposed;
+
+ @ApiModelProperty(value = "是否借用未归还")
+ private Integer borrowed;
+
+ @ApiModelProperty(value = "是否被领用")
+ private Integer inUse;
}
--
Gitblit v1.7.1