Merge branch 'master' of http://10.2.1.24:10244/zhaoy/BPA.NewKitChen.Manage

BPA.SAAS.Manage.Application/DataBase/Services/GoodsService.cs

@@ -943,7 +943,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                 {
                     value = "";
                 }
-                if (value.ToString().Trim() == goodsName.Trim())
+                if (value.ToString().Trim() == goodsName?.Trim())
                 {
                     //ColumnAttribute attribute = (ColumnAttribute)item2.GetCustomAttribute(typeof(ColumnAttribute), false);
                     //return attribute?.Name;
@@ -1096,7 +1096,7 @@ namespace BPA.SAAS.Manage.Application.DataBase.Services
                     {
                         TechnologyExportRecode.CreateAt= DateTime.Now;
                     TechnologyExportRecode.TemplatePath = path;
-                    await _db.Updateable(TechnologyExportRecode).ExecuteCommandAsync();
+                  var vvv=  await _db.Updateable(TechnologyExportRecode).ExecuteCommandAsync();
                     }
                     else
                     {

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

@@ -43,7 +43,7 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                      ProductName = c.Name,
                      CreateAt = a.CreateAt,
                      DeviceVersionId = b.Id,
-                    TemplatePath=b.TemplatePath
+                    TemplatePath=a.TemplatePath
                 })
                
                  .OrderBy(a=>a.CreateAt, OrderByType.Desc)