From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 604001d..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;
@@ -39,13 +39,13 @@
/**
* 璁惧鍝佺墝
*/
- @ApiModelProperty("璁惧鍝佺墝")
+ @Schema(description = "璁惧鍝佺墝")
private String deviceBrand;
/**
* 瀛樻斁浣嶇疆
*/
- @ApiModelProperty("瀛樻斁浣嶇疆")
+ @Schema(description = "瀛樻斁浣嶇疆")
private String storageLocation;
@@ -115,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