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

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;
 }

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

@@ -174,6 +174,7 @@
         d.device_pic,
         dt.type_name,
         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}