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}