From e8fd9aa8a76c638991e60544ccab53e2e5bd5b6a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 09 九月 2024 14:16:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Model/Entities/Bill/CoreCmsBillDeliveryPartial.cs |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/CoreCms.Net.Model/Entities/Bill/CoreCmsBillDeliveryPartial.cs b/CoreCms.Net.Model/Entities/Bill/CoreCmsBillDeliveryPartial.cs
index 4739b8a..3ebc1f6 100644
--- a/CoreCms.Net.Model/Entities/Bill/CoreCmsBillDeliveryPartial.cs
+++ b/CoreCms.Net.Model/Entities/Bill/CoreCmsBillDeliveryPartial.cs
@@ -32,5 +32,16 @@
         [SugarColumn(IsIgnore = true)]
         public System.String shipAreaIdName { get; set; }
 
+       
+        /// <summary>
+        /// 鍟嗗搧鍒楄〃
+        /// </summary>
+        [Navigate(NavigateType.OneToOne,nameof(orderId))]
+        public  CoreCmsOrder? order { get; set; }
+        /// <summary>
+        /// sendDistributionAccept 缁忛攢鍟嗗彂璐х‘璁ょ姸鎬佸瓧绗︿覆鎻忚堪
+        /// </summary>
+        [SugarColumn(IsIgnore =true)]
+        public string  distributionAcceptStr { get; set; }
     }
 }

--
Gitblit v1.9.1