From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 26bdc91..79e0aff 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -35,6 +35,19 @@
* 瑙勬牸鍨嬪彿
*/
private String deviceModel;
+
+ /**
+ * 璁惧鍝佺墝
+ */
+ @Schema(description = "璁惧鍝佺墝")
+ private String deviceBrand;
+
+ /**
+ * 瀛樻斁浣嶇疆
+ */
+ @Schema(description = "瀛樻斁浣嶇疆")
+ private String storageLocation;
+
/**
* 渚涘簲鍟嗗悕绉�
@@ -102,24 +115,34 @@
*/
private Long tenantId;
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planRuntimeTime;
- @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+ @Schema(description = "寮�濮嬭繍琛屾椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startRuntimeTime;
- @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+ @Schema(description = "缁撴潫杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endRuntimeTime;
- @ApiModelProperty("杩愯鏃堕暱")
+ @Schema(description = "杩愯鏃堕暱")
private String runtimeDuration;
+
+
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ private Integer isDepr;
+
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
+ private BigDecimal annualDepreciationAmount;
+
+ @Schema(description = "璁惧绫诲瀷")
+ private String type;
}
--
Gitblit v1.9.3