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

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

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