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 1/2] =?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; From 235ec8a25d4c36dabbdbe527c237618514e0dbea Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 1 Jun 2026 22:55:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update:=E6=9B=B4=E6=8D=A2=E9=80=9A=E8=AE=AF?= =?UTF-8?q?=E5=BD=95=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/header/address_book.png | Bin 0 -> 7372 bytes main/manager-web/src/components/HeaderBar.vue | 30 ++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 main/manager-web/src/assets/header/address_book.png diff --git a/main/manager-web/src/assets/header/address_book.png b/main/manager-web/src/assets/header/address_book.png new file mode 100644 index 0000000000000000000000000000000000000000..4365df1b2d5a9a2c2a3877e1b456ef7f3ecad98a GIT binary patch literal 7372 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
+ :class="{ 'active-tab': $route.path === '/voice-clone-management' }" + @click="handleRouter('voiceCloneManagement')"> + +
- @@ -144,8 +146,8 @@ {{ $t("header.serverSideManagement") }} - {{ $t("header.featureManagement") }} - + {{ $t("header.featureManagement") }} +
@@ -199,11 +201,10 @@