From 77ae6ed9a1a800bab0d048a6453d383ec35a54b9 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 13 Oct 2025 15:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index 0609536..c6aa5aa 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -600,6 +600,7 @@
return null;
}
DeviceDTO.DeviceDTOBuilder deviceDTOBuilder = DeviceDTO.builder()
+ .id(entity.getId())
.deviceSn(entity.getDeviceSn())
.childDeviceSn(entity.getChildSn())
.deviceName(entity.getDeviceName())
--
Gitblit v1.9.3