From b2559d629ce3ea2c40cdaa14634d2f5de7f81693 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Mon, 30 Jan 2023 11:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=BD=E7=95=A5=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       |  4 ++-
 .../Service/DataSync/Dto/BookingOrderDto.cs   | 16 ++++++------
 .../Service/DataSync/Dto/DjyCustomerDto.cs    | 26 +++++++++----------
 Myshipping.Core/Entity/DJY/DjyVesselInfo.cs   |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 7efec7cf..bb516ad2 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -511,7 +511,9 @@ namespace Myshipping.Application
                 it.TenantId,
                 it.CreatedTime,
                 it.CreatedUserId,
-                it.CreatedUserName
+                it.CreatedUserName,
+                it.TenantName,
+                it.IsDeleted,
             }).ExecuteCommandAsync();
             var ctnlist = await _repCtn.AsQueryable().Where(x => x.BILLID == input.Id).Select(x => x.Id).ToListAsync();
             await _repCtn.DeleteAsync(x => x.BILLID == input.Id);
diff --git a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs
index afad8367..46a3f69d 100644
--- a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs
+++ b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs
@@ -8,10 +8,10 @@ namespace Myshipping.Application.Service.DataSync.Dto
 {
     public class SyncBookingOrderDto
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public long Id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //public long Id { get; set; }
 
         /// <summary>
         /// 业务编号
@@ -628,10 +628,10 @@ namespace Myshipping.Application.Service.DataSync.Dto
 
     public class Children
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public long Id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //public long Id { get; set; }
 
         /// <summary>
         /// 业务编号
diff --git a/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs b/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs
index 5836b419..e0ee03d4 100644
--- a/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs
+++ b/Myshipping.Application/Service/DataSync/Dto/DjyCustomerDto.cs
@@ -9,10 +9,10 @@ namespace Myshipping.Application
     /// </summary>
     public class DjyCustomerSyncDto
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public long? Id { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //public long? Id { get; set; }
         /// <summary>
         /// 东胜id
         /// </summary>
@@ -138,15 +138,15 @@ namespace Myshipping.Application
     /// </summary>
     public class DjyCustomerContactSyncDto
     {
-        /// <summary>
-        /// 主键
-        /// </summary>
-        public long? Id { get; set; }
-
-        /// <summary>
-        /// 客户Id
-        /// </summary>
-        public long? CustomerId { get; set; }
+        ///// <summary>
+        ///// 主键
+        ///// </summary>
+        //public long? Id { get; set; }
+
+        ///// <summary>
+        ///// 客户Id
+        ///// </summary>
+        //public long? CustomerId { get; set; }
 
         /// <summary>
         /// 角色ID
diff --git a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
index 13ed3dbc..5afef001 100644
--- a/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
+++ b/Myshipping.Core/Entity/DJY/DjyVesselInfo.cs
@@ -101,7 +101,7 @@ namespace Myshipping.Application.Entity
         /// 东胜id
         /// </summary>
         public string BSNO { get; set; }
-        public virtual long Id { get; set; }
+         public virtual long Id { get; set; }
         /// <summary>
         /// 船名
         /// </summary>