Merge branch 'master' into groupmealmanage

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

@@ -72,6 +72,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                    Name = a.DeviceName,
                    AutoKey=a.AutoKey.ToString(),
                    Vesion=SqlFunc.Subqueryable<BPA_ProductVesion>().Where(x=>x.Id==a.ProductVersionId).First().Vesion,
+                   PrductKey = SqlFunc.Subqueryable<BPA_Product>().Where(x => x.Id == a.ProductId).First().Key,
                }) .ToListAsync();
             return data;
         }

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

@@ -18,5 +18,6 @@ namespace BPA.SAAS.Manage.Comm.Model
         public string Name { get; set; }
         public string AutoKey { get; set; }
         public string Vesion { get; set; }
+        public string PrductKey { get; set; }
     }
 }