From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' into radio_frequency
---
cnas-device/src/main/java/com/ruoyi/device/dto/DeviceDto.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceDto.java b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceDto.java
index da16e75..d62a61a 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceDto.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/dto/DeviceDto.java
@@ -6,7 +6,6 @@
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-
import java.time.LocalDateTime;
@Data
@@ -39,5 +38,14 @@
@ApiModelProperty(value = "涓嬫鏍″噯鏃ユ湡")
private LocalDateTime nextCalibrationDateTwo;
+ private String deviceName;
+ private String specModel;
+ private String manageNumber;
+ // 鍏ㄥ弬鏋勯�犲嚱鏁�
+ public DeviceDto(String deviceName, String specModel, String manageNumber) {
+ this.deviceName = deviceName;
+ this.specModel = specModel;
+ this.manageNumber = manageNumber;
+ }
}
--
Gitblit v1.9.3