Merge remote-tracking branch 'origin/dev' into dev

Xiajijian

2025-10-13 77ae6ed9a1a800bab0d048a6453d383ec35a54b9

Merge remote-tracking branch 'origin/dev' into dev

 ard-sample/src/main/java/com/ard/sample/manage/model/dto/DeviceDTO.java

@@ -19,6 +19,8 @@
@Builder
public class DeviceDTO {

    private Integer id;

    private String deviceSn;

    private String deviceName;

 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())