liwenlong/fys-Multi-tenant
1
0
Fork 0
forked from dyf/fys-Multi-tenant
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into dyf-device

Browse Source 
# Conflicts:
#	fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java
#	fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
This commit is contained in:
daiyongfei
2025-07-10 15:16:57 +08:00
parent 185d521472 b876d051d8
commit 4cc02e1040
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java
View File

@ -38,5 +38,8 @@ public class AppDeviceVo {
*/ */
private String typeName; private String typeName;
/**
* 蓝牙名称
*/
private String bluetoothName;
} }

1
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
View File

@ -174,6 +174,7 @@
d.device_pic, d.device_pic,
dt.type_name, dt.type_name,
dt.communication_mode dt.communication_mode
d.bluetooth_name
from device d from device d
inner join device_type dt on d.device_type = dt.id inner join device_type dt on d.device_type = dt.id
where d.binding_user_id = #{criteria.bindingUserId} where d.binding_user_id = #{criteria.bindingUserId}