Merge branch 'refs/heads/development'

Src/Dlhis.Basic/Organization/Request/OldGainfoUploadRequest.cs

@@ -8,7 +8,7 @@ public class OldDeviceGainfoUploadRequest
     public string Factory { get; set; }
 
     [Required]
-    public string UniqueNo { get; set; }
+    public string DeviceUniqueNo { get; set; }
 
     /// <summary>
     /// 档案号

Src/Dlhis.Basic/Organization/Services/Implements/OldGainfoService.cs

@@ -21,7 +21,7 @@ public class OldGainfoService : IOldDeviceGainfoService
 
         foreach (var entity in entities)
         {
-            if (!await _dbContext.Queryable<OldDeviceGainfoEntity>().AnyAsync(x => x.No == entity.No && x.Code == entity.Code && x.UniqueNo == entity.UniqueNo))
+            if (!await _dbContext.Queryable<OldDeviceGainfoEntity>().AnyAsync(x => x.No == entity.No && x.Code == entity.Code && x.DeviceUniqueNo == entity.DeviceUniqueNo))
             {
                 await _dbContext.InsertAsync(entity);
             }

Src/Dlhis.Entity/Basic/Entity/OldDeviceGainfoEntity.cs

@@ -29,7 +29,7 @@ public class OldDeviceGainfoEntity
     /// 设备唯一号
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = "设备唯一号", IndexGroupNameList = new[] { "unique_OldGainfos_no_code_unique" })]
-    public string UniqueNo { get; set; }
+    public string DeviceUniqueNo { get; set; }
 
     /// <summary>
     /// 处理状态