Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs

@@ -71,7 +71,7 @@ public class DeviceConnectService : IDeviceConnectService
         if (request.BusinessPlaceCode.HasValue)
         {
             var businessPlace = await _dbContext.Queryable<BusinessPlaceEntity>().Where(x => x.Code == request.BusinessPlaceCode).FirstAsync();
-            businessPlace.ThrowIfNull("营业点不存在,无法设置到设备注册信息中");
+            businessPlace.ThrowIfNull("营业点不存在,无法设置到设备注册信息中"); 
         }
 
         //更新营业点信息
@@ -123,8 +123,8 @@ public class DeviceConnectService : IDeviceConnectService
     private async Task<DeviceEntity> GetEnableDeviceAsync(string uniqueNo, bool checkExists = true, string deployPlace = "", string tenantId = "")
     {
         var device = await _dbContext.Queryable<DeviceEntity>()
-            .Where(x => x.UniqueNo == uniqueNo)
-            .FirstAsync();
+       .Where(x => x.UniqueNo == uniqueNo)
+       .FirstAsync();
 
         if (checkExists)
         {
@@ -165,4 +165,4 @@ public class DeviceConnectService : IDeviceConnectService
 
         return device;
     }
-}
+}