From 581bf7c6dff865c704378e157db735f6a030f04c Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Mon, 31 Oct 2022 15:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E8=88=B1=E5=8A=A0=E4=B8=BB=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E7=A7=9F=E6=88=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Application/Entity/BookingOrder.cs     |  8 ++++++++
 Myshipping.Application/Myshipping.Application.xml | 10 ++++++++++
 Myshipping.Core/SqlSugar/SqlSugarSetup.cs         |  4 ++++
 3 files changed, 22 insertions(+)

diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs
index 9893e105..af43b196 100644
--- a/Myshipping.Application/Entity/BookingOrder.cs
+++ b/Myshipping.Application/Entity/BookingOrder.cs
@@ -591,5 +591,13 @@ namespace Myshipping.Application.Entity
         /// 付款方
         /// </summary>
         public string FREIGHTPAYER { get; set; }
+        /// <summary>
+        /// 租户名称
+        /// </summary>
+        public string TenantName { get; set; }
+        /// <summary>
+        /// 主单ID
+        /// </summary>
+        public long? ParentId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 26d3a94d..0ec30cef 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -894,6 +894,16 @@
             付款方
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.BookingOrder.TenantName">
+            <summary>
+            租户名称
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingOrder.ParentId">
+            <summary>
+            主单ID
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.Entity.BookingTemplate">
             <summary>
             
diff --git a/Myshipping.Core/SqlSugar/SqlSugarSetup.cs b/Myshipping.Core/SqlSugar/SqlSugarSetup.cs
index 0b44d2ca..ccf8cf36 100644
--- a/Myshipping.Core/SqlSugar/SqlSugarSetup.cs
+++ b/Myshipping.Core/SqlSugar/SqlSugarSetup.cs
@@ -332,6 +332,10 @@ public static class SqlSugarSetup
                                     if (tenantId == null || tenantId == 0)
                                         entityInfo.SetValue(App.User.FindFirst(ClaimConst.TENANT_ID)?.Value);
                                 }
+                                if (entityInfo.PropertyName == "TenantName")
+                                {
+                                    entityInfo.SetValue(App.User.FindFirst(ClaimConst.CLAINM_TENANT_NAME)?.Value);
+                                }
                                 if (entityInfo.PropertyName == "CreatedUserId")
                                 {
                                     var createUserId = ((dynamic)entityInfo.EntityValue).CreatedUserId;