From effe95ba8f60660788842e1cb52c0bbe124b8eab Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 1 Jun 2026 22:54:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=94=A8=E6=88=B7=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E7=BC=BA=E5=A4=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/device/service/impl/DeviceServiceImpl.java | 1 - .../xiaozhi/modules/device/vo/UserShowDeviceListVO.java | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java index ca6405a1..20f689d3 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java @@ -304,7 +304,6 @@ public class DeviceServiceImpl extends BaseServiceImpl return devices.stream().map(device -> { UserShowDeviceListVO vo = ConvertUtils.sourceToTarget(device, UserShowDeviceListVO.class); vo.setDeviceType(device.getBoard()); - vo.setBoard(device.getBoard()); // 设置UTC时间戳供前端使用时区转换 if (device.getLastConnectedAt() != null) { vo.setLastConnectedAtTimestamp(device.getLastConnectedAt().getTime()); diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java b/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java index d7035c32..a2582c28 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/vo/UserShowDeviceListVO.java @@ -1,11 +1,12 @@ package xiaozhi.modules.device.vo; +import java.util.Date; + import com.fasterxml.jackson.annotation.JsonFormat; + import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.util.Date; - @Data @Schema(description = "用户显示设备列表VO") public class UserShowDeviceListVO { @@ -28,6 +29,9 @@ public class UserShowDeviceListVO { @Schema(description = "mac地址") private String macAddress; + @Schema(description = "设备别名") + private String alias; + @Schema(description = "开启OTA") private Integer otaUpgrade;