Merge branch 'master' into storemanagement

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

@@ -78,6 +78,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
             {
                 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.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;
             });
             return data;

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

@@ -111,7 +111,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
             catch (Exception e)
             {
                 _db.Ado.RollbackTran();
-                throw Oops.Oh("添加失败");
+                throw Oops.Oh("添加失败,"+e.Message);
             }
            
         }

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

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