Merge branch 'master' into kitchenmanage

BPA.SAAS.Manage.Application/Device/Services/DeviceService.cs

@@ -80,11 +80,13 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                    AutoKey=a.AutoKey.ToString(),
                    ProductVersionId=a.ProductVersionId,
                    ProductId=a.ProductId,
+                  
                }) .ToListAsync();
             data.ForEach(x =>
             {
                 x.Vesion = _db.Queryable<BPA_ProductVesion>().Where(s => s.Id == x.ProductVersionId).First()?.Vesion;
                 x.ProductNumber = _db.Queryable<BPA_ProductVesion>().Where(s => s.Id == x.ProductVersionId).First()?.ProductNumber;
+                x.ProductUrl = _db.Queryable<BPA_ProductVesion>().Where(s => s.Id == x.ProductVersionId).First()?.ProductUrl; 
                 x.ProductName = _db.Queryable<BPA_Product>().Where(s => s.Id == x.ProductId).First()?.Name;
                 x.PrductKey = _db.Queryable<BPA_Product>().Where(s => s.Id == x.ProductId).First()?.Key;
             });

BPA.SAAS.Manage.Comm/Model/ListSelectQuery.cs

@@ -23,6 +23,7 @@ namespace BPA.SAAS.Manage.Comm.Model
         public string PrductKey { get; set; }
         public int? ProductNumber { get; set; }
         public string ProductName { get; set; }
-        
+        public string ProductUrl { get; set; }
+
     }
 }