From ff5b2e96579e875a07d4baf8559395ce2f5a1be2 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Tue, 17 Jan 2023 17:33:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       | 10 +++----
 Myshipping.Core/Myshipping.Core.xml           | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index c65530cb..0cd8d1a5 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -3831,7 +3831,7 @@ namespace Myshipping.Application
         {
             BookingOrder order = new BookingOrder();
             BookingCtn ctn = new BookingCtn();
-            BookingEDIExt ext = new BookingEDIExt();
+            BookingEDIExt edi = new BookingEDIExt();
             Dictionary<string, string> dic = new Dictionary<string, string>();
             foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(order))
             {
@@ -3842,7 +3842,7 @@ namespace Myshipping.Application
                 }
                 if (!string.IsNullOrWhiteSpace(descriptor.Description))
                 {
-                    dic.Add(descriptor.Name, descriptor.Description);
+                    dic.Add("order."+descriptor.Name, descriptor.Description);
                 }
             }
 
@@ -3858,14 +3858,14 @@ namespace Myshipping.Application
                 }
                 if (!string.IsNullOrWhiteSpace(descriptor.Description))
                 {
-                    dic1.Add(descriptor.Name, descriptor.Description);
+                    dic1.Add("ctn." + descriptor.Name, descriptor.Description);
                 }
             }
 
 
 
             Dictionary<string, string> dic2 = new Dictionary<string, string>();
-            foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(ext))
+            foreach (PropertyDescriptor descriptor in TypeDescriptor.GetProperties(edi))
             {
                 string name = descriptor.Name;
                 if (name == "TenantId" || name == "CreatedTime" || name == "UpdatedTime" || name == "CreatedUserId" || name == "CreatedUserName")
@@ -3874,7 +3874,7 @@ namespace Myshipping.Application
                 }
                 if (!string.IsNullOrWhiteSpace(descriptor.Description))
                 {
-                    dic2.Add(descriptor.Name, descriptor.Description);
+                    dic2.Add("edi." + descriptor.Name, descriptor.Description);
                 }
             }
 
diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 253d635a..49f0dc63 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -542,6 +542,21 @@
             大简云userid
             </summary>
         </member>
+        <member name="F:Myshipping.Core.ClaimConst.Tel">
+            <summary>
+            电话
+            </summary>
+        </member>
+        <member name="F:Myshipping.Core.ClaimConst.Phone">
+            <summary>
+            手机
+            </summary>
+        </member>
+        <member name="F:Myshipping.Core.ClaimConst.Email">
+            <summary>
+            邮箱
+            </summary>
+        </member>
         <member name="F:Myshipping.Core.CommonConst.CACHE_KEY_USER">
             <summary>
             用户缓存
@@ -5657,6 +5672,21 @@
             大简云userid
             </summary>
         </member>
+        <member name="P:Myshipping.Core.UserManager.TEl">
+            <summary>
+            电话
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.UserManager.Phone">
+            <summary>
+            手机
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.UserManager.Email">
+            <summary>
+            邮箱
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.TokenModel">
             <summary>
             AccessToken参数