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

Myshipping.Application/Entity/BookingTruck.cs

@@ -14,7 +14,7 @@ namespace Myshipping.Application.Entity
         /// <summary>
         /// 订舱ID
         /// </summary>
-        [Description("车队ID")]
+        [Description("订舱ID")]
         public Nullable<long> BookingId { get; set; }
         /// <summary>
         /// 车队ID
@@ -27,9 +27,9 @@ namespace Myshipping.Application.Entity
         [Description("车队代码")]
         public string TruckCode { get; set; }
         /// <summary>
-        /// 车队代码
+        /// 车队名称
         /// </summary>
-        [Description("车队代码")]
+        [Description("车队名称")]
         public string TruckName { get; set; }
         /// <summary>
         /// TO

Myshipping.Application/Service/BookingTruck/BookingTruckService.cs

@@ -99,7 +99,7 @@ namespace Myshipping.Application
             {
                 _bookingTruckRepository.Insert(entity);
 
-                if (entityCtnList.Count > 0)
+                if (entityCtnList != null && entityCtnList.Count > 0)
                 {
                     entityCtnList.ForEach(async ctn =>
                     {
@@ -124,7 +124,7 @@ namespace Myshipping.Application
                     it.TruckCode,
                 }).ExecuteCommandAsync();
 
-                if (entityCtnList.Count > 0)
+                if (entityCtnList != null && entityCtnList.Count > 0)
                 {
                     entityCtnList.ForEach(async ctn =>
                     {