From 9cd4074a456fd5c422506279191b6015836347e5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 30 十月 2026 10:08:35 +0800
Subject: [PATCH] feat: 设备台账启用状态、审批签核展示与导入健壮性
---
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 79e0aff..5241af0 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -12,6 +12,9 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
/**
* 璁惧鍙拌处瀹炰綋绫�
@@ -53,6 +56,20 @@
* 渚涘簲鍟嗗悕绉�
*/
private String supplierName;
+
+ /**
+ * 璁惧闄勪欢(鐢ㄤ簬鎺ユ敹)
+ */
+ @TableField(exist = false)
+ @Schema(description = "璁惧闄勪欢鎺ユ敹鍒楄〃")
+ private List<StorageBlobDTO> storageBlobDTOs;
+
+ /**
+ * 璁惧闄勪欢(鐢ㄤ簬杩斿洖)
+ */
+ @TableField(exist = false)
+ @Schema(description = "璁惧闄勪欢灞曠ず鍒楄〃")
+ private List<StorageBlobVO> storageBlobVOs;
/**
* 鍗曚綅
@@ -118,6 +135,12 @@
@Schema(description = "鐘舵��")
private String status;
+ /**
+ * 鏄惁鍚敤 1-鍚敤 0-鍋滅敤锛屽仠鐢ㄨ澶囦笉鍙備笌宸℃
+ */
+ @Schema(description = "鏄惁鍚敤 1-鍚敤 0-鍋滅敤")
+ private Integer isEnabled;
+
@Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@@ -145,4 +168,15 @@
@Schema(description = "璁惧绫诲瀷")
private String type;
+
+ /**
+ * 璁惧鍖哄煙ID
+ */
+ private Long areaId;
+
+ /**
+ * 璁惧鍖哄煙鍚嶇О锛堥潪鏁版嵁搴撳瓧娈碉紝鍒楄〃灞曠ず锛�
+ */
+ @TableField(exist = false)
+ private String areaName;
}
--
Gitblit v1.9.3