Merge branch 'master' of http://60.209.125.238:20010/whm/BookingHeChuan

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1124,10 +1124,13 @@ namespace Myshipping.Application
                 }
 
                 //把前端传递的已修改字段转换为属性名称
+                var lstPropName = new List<string>
+                {
+                    "CNTRTOTAL"
+                };
                 if (input.ChangedFields != null && input.ChangedFields.Count > 0)
                 {
                     var propsOrder = typeof(BookingOrder).GetProperties();
-                    var lstPropName = new List<string>();
                     input.ChangedFields.ForEach(x =>
                     {
                         var pchg = propsOrder.FirstOrDefault(p => p.Name.ToLower() == x.ToLower());
@@ -1137,11 +1140,9 @@ namespace Myshipping.Application
                         }
                     });
 
-                    if (lstPropName.Count > 0)
-                    {
-                        await _rep.AsUpdateable(entity).UpdateColumns(lstPropName.ToArray()).ExecuteCommandAsync();
-                    }
                 }
+
+                await _rep.AsUpdateable(entity).UpdateColumns(lstPropName.ToArray()).ExecuteCommandAsync();
                 //await _rep.AsUpdateable(entity).IgnoreColumns(it => new
                 //{
                 //    it.ParentId,
@@ -1266,7 +1267,7 @@ namespace Myshipping.Application
                     _logger.LogInformation($"数据有变化，更新运踪订阅");
                     //更改提单号重新订阅运踪
                     await _publisher.PublishAsync(new ChannelEventSource("BillTrace:Update", new { BookingId = entity.Id, TenentId = UserManager.TENANT_ID, UserId = UserManager.UserId, UserName = UserManager.Name, DjyUserId = UserManager.DjyUserId }));
-    
+
                     if (!string.IsNullOrEmpty(reqId))
                     {
                         _logger.LogWarning($"保存请求[{reqId}]，更新运踪完成");

Myshipping.Web.Core/applicationconfig.json

@@ -1,7 +1,7 @@
 {
   //如果前端不代理的话，又是axios请求的话，需要添加以下代码
   "CorsAccessorSettings": {
-    "WithExposedHeaders": [ "Content-Disposition" ]
+    "WithExposedHeaders": [ "Content-Disposition", "access-token", "x-access-token", "need-modify-password" ]
   },
   //动态api配置
   //"DynamicApiControllerSettings": {