From 1428284ade391f33c6fea64d87b2366af5c50aee Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 25 六月 2024 09:05:32 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop

---
 CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs b/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs
index 13e4497..ff12ccb 100644
--- a/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs
+++ b/CoreCms.Net.Model/Entities/baifenbingfa/DistributionSend/DistributionSendOder.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressDeliveryOpenMessageGetDeliveryListResponse.Types;
 
 namespace CoreCms.Net.Model.Entities.baifenbingfa.DistributionSendOder
 {
@@ -14,8 +15,10 @@
     /// </summary>
     [SugarTable(TableDescription = "渚涘簲鍟嗗彂璐ч厤鍙戣褰�")]
     [SqlCodeFirst]
-    public class DistributionSendOder: BFBaseModel
+    public partial class DistributionSendOder: BFBaseModel
     {
+
+
         /// <summary>
         /// ID
         /// </summary>
@@ -61,11 +64,22 @@
         /// </summary>
         [SugarColumn(ColumnDescription = "閰嶉�佸崟Id")]
         public string deliveryID { get; set; }
+        /// <summary>
+        /// 閰嶉�佽垂鐢�
+        /// </summary>
+        [SugarColumn(ColumnDescription = "閰嶉�佽垂鐢�",DefaultValue ="0")]
+        public decimal amount { get; set; }= 0;
 
         /// <summary>
         /// 閰嶉�佺姸鎬�
         /// </summary>
         [SugarColumn(ColumnDescription = "閰嶉�佺姸鎬�",IsNullable =true)]
         public sendDistributionAcceptType? sendDistributionAccept { get; set; }
+
+        /// <summary>
+        /// 搴旇仒鑱屽姟
+        /// </summary>
+        [Navigate(NavigateType.OneToOne, nameof(deliveryID))]
+        public CoreCmsBillDelivery delivery { get; set; }
     }
 }

--
Gitblit v1.9.1