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

# 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
2025-07-10 15:16:57 +08:00
parent 185d521472 b876d051d8
commit 4cc02e1040
2 changed files with 5 additions and 1 deletions
--- 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
@ -38,5 +38,8 @@ public class AppDeviceVo {
     */
    private String typeName;

-
+    /**
+     *  蓝牙名称
+     */
+    private String bluetoothName;
 }