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

Myshipping.Core/Myshipping.Core.xml

@@ -10744,6 +10744,11 @@
             服务项目
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Service.QueryDjyCustomerInput.SALE">
+            <summary>
+            销售
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.Service.DjyCustomerOutput">
             <summary>
             客户输出参数
@@ -18005,6 +18010,11 @@
             开船日期
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.DjyVesselInfo.YgtETD">
+            <summary>
+            开船日期
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.Entity.DjyVesselInfo.ClosingDate">
             <summary>
             截港日期

Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs

@@ -67,6 +67,7 @@ namespace Myshipping.Core.Service
                 .WhereIF(!string.IsNullOrWhiteSpace(input.USDBank), u => u.USDBank.Contains(input.USDBank.Trim()))
                 .WhereIF(!string.IsNullOrWhiteSpace(input.USDAccount), u => u.USDAccount.Contains(input.USDAccount.Trim()))
                 .WhereIF(!string.IsNullOrWhiteSpace(input.ServiceItem), u => u.ServiceItem.Contains(input.ServiceItem.Trim()))
+                .WhereIF(!string.IsNullOrWhiteSpace(input.SALE), u => u.SALE.Contains(input.SALE.Trim()))
                 .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.ShortName.Contains(input.SearchValue.Trim()) || u.CodeName.Contains(input.SearchValue.Trim()))
                 .Where(u => u.TenantId == UserManager.TENANT_ID) //权限范围目前不支持根据模块设置，客户模块暂时写死本公司数据
                 .ToPagedListAsync(input.PageNo, input.PageSize);

Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs

@@ -322,6 +322,10 @@ namespace Myshipping.Core.Service
         /// 服务项目
         /// </summary>
         public string ServiceItem { get; set; }
+        /// <summary>
+        /// 销售
+        /// </summary>
+        public string SALE { get; set; }
 
     }
 }