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

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -873,10 +873,10 @@ namespace Myshipping.Application
             {
                 SystemCode = "djy_hechuan",
                 CarrierCode = order.CARRIERID,
-                billOrderId = order.Id,
+                billOrderId = order.Id.ToString(),
                 sendOrderCode = order.MBLNO,
                 userId = UserManager.DjyUserId,
-                customerId = order.CUSTOMERID,
+                customerId = order.CUSTOMERID.ToString(),
                 // userName = currUser.CODENAME,
                 //userPassword = currUser.PASSWORD,
                 operatorName = UserManager.Name,
@@ -891,7 +891,7 @@ namespace Myshipping.Application
                 {
                     return new
                     {
-                        boxType = ctnMapping.First(x => x.Code == c.CTNCODE),
+                        boxType = ctnMapping.First(x => x.Code == c.CTNCODE).MapCode,
                         boxCount = c.CTNNUM.Value
                     };
                 }),

Myshipping.Core/Entity/CommonDB/CodeYard.cs

@@ -32,27 +32,6 @@ namespace Myshipping.Core.Entity
         /// </summary>
         public string Remark { get; set; }
 
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-
-        /// <summary>
-        /// 修改时间
-        /// </summary>
-        public DateTime? ModifyTime { get; set; }
-
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public string CreateUser { get; set; }
-
-        /// <summary>
-        /// 修改人
-        /// </summary>
-        public string ModifyUser { get; set; }
-
-
     }
 
 

Myshipping.Core/Myshipping.Core.xml

@@ -1242,26 +1242,6 @@
             备注
             </summary>
         </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.CreateTime">
-            <summary>
-            创建时间
-            </summary>
-        </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.ModifyTime">
-            <summary>
-            修改时间
-            </summary>
-        </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.CreateUser">
-            <summary>
-            创建人
-            </summary>
-        </member>
-        <member name="P:Myshipping.Core.Entity.CodeYard.ModifyUser">
-            <summary>
-            修改人
-            </summary>
-        </member>
         <member name="P:Myshipping.Core.Entity.MappingYard.Code">
             <summary>
             代码