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

Myshipping.Application/Entity/BookingEDIExt.cs

@@ -125,5 +125,25 @@ namespace Myshipping.Application.Entity
         /// 销售EDI名称
         /// </summary>
         public string SalerCodeName { get; set; }
+
+        /// <summary>
+        /// 欧盟港口、伊朗港口、KHI
+        /// </summary>
+        public string CKHI { get; set; }
+
+        /// <summary>
+        /// 南美东
+        /// </summary>
+        public string CNCM { get; set; }
+
+        /// <summary>
+        /// 巴西线的木质包装情况
+        /// </summary>
+        public string WNCM { get; set; }
+
+        /// <summary>
+        /// 订舱人说明
+        /// </summary>
+        public string OrderRemark { get; set; }
     }
 }

Myshipping.Application/Myshipping.Application.xml

@@ -2365,6 +2365,26 @@
             销售EDI名称
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.BookingEDIExt.CKHI">
+            <summary>
+            欧盟港口、伊朗港口、KHI
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingEDIExt.CNCM">
+            <summary>
+            南美东
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingEDIExt.WNCM">
+            <summary>
+            巴西线的木质包装情况
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingEDIExt.OrderRemark">
+            <summary>
+            订舱人说明
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.Entity.BookingExcelTemplate">
             <summary>
             EXCEl打印模板