From bcc80a6833abe9f24abdb978f7c7f01b664a574f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 18 二月 2025 14:48:45 +0800
Subject: [PATCH] 优化调整

---
 cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
index 8bd8ce8..e140fc0 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/dto/DeviceDto.java
@@ -7,6 +7,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -22,5 +24,26 @@
 
     @ValueTableShow(13)
     @ApiModelProperty(value = "妫�楠岄」鐩�")
-    private Integer insProductItem;
+    private String insProductItem;
+
+
+    @ApiModelProperty(value = "绠$悊浜哄鍚�")
+    private String equipmentManagerName;
+
+    @ApiModelProperty(value = "琚巿鏉冧汉濮撳悕")
+    private String authorizedPersonName;
+
+    @ApiModelProperty(value = "鏍稿噯璇佷功缂栧彿")
+    private String calibrateNo;
+
+    @ValueTableShow(value = 15, name = "鏈�杩戞牎鍑嗘棩鏈�")
+    @ApiModelProperty(value = "鏈�杩戞牎鍑嗘棩鏈�")
+    private LocalDateTime lastCalibrationDateTwo;
+
+    @ValueTableShow(value = 16, name = "涓嬫鏍″噯鏃ユ湡")
+    @ApiModelProperty(value = "涓嬫鏍″噯鏃ユ湡")
+    private LocalDateTime nextCalibrationDateTwo;
+
+    @ApiModelProperty(value = "鏍″噯鎻愰啋")
+    private String status;
 }

--
Gitblit v1.9.3