From b876d051d8f85adb7316c8441502d75f1577068f Mon Sep 17 00:00:00 2001 From: chenyouting <514333061@qq.com> Date: Thu, 10 Jul 2025 13:33:32 +0800 Subject: [PATCH] =?UTF-8?q?app=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=93=9D=E7=89=99=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java | 5 +++++ .../src/main/resources/mapper/equipment/DeviceMapper.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java index ee6a357..ae4eff8 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java @@ -32,4 +32,9 @@ public class AppDeviceVo { * 设备图片 */ private String devicePic; + + /** + * 蓝牙名称 + */ + private String bluetoothName; } diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml index 44aea49..7426896 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml @@ -172,7 +172,8 @@ d.device_sn, d.device_imei, d.device_mac, - dt.communication_mode + dt.communication_mode, + d.bluetooth_name from device d inner join device_type dt on d.device_type = dt.id where d.binding_user_id = #{criteria.bindingUserId}