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/Order/CoreCmsOrder.cs | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs b/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
index 10c964c..fd44bea 100644
--- a/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
+++ b/CoreCms.Net.Model/Entities/Order/CoreCmsOrder.cs
@@ -8,6 +8,7 @@
* Description: 鏆傛棤
***********************************************************************/
+using Chuanyin.Attribute;
using SqlSugar;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
@@ -17,6 +18,7 @@
/// <summary>
/// 璁㈠崟琛�
/// </summary>
+ [SqlCodeFirst]
public partial class CoreCmsOrder
{
/// <summary>
@@ -175,11 +177,9 @@
/// <summary>
/// 閰嶉�佹柟寮忓悕绉�
/// </summary>
- [Display(Name = "閰嶉�佹柟寮忓悕绉�")]
-
+ [Display(Name = "閰嶉�佹柟寮忓悕绉�")]
- [StringLength(maximumLength:50,ErrorMessage = "{0}涓嶈兘瓒呰繃{1}瀛�")]
-
+ [StringLength(maximumLength:50,ErrorMessage = "{0}涓嶈兘瓒呰繃{1}瀛�")]
public System.String logisticsName { get; set; }
@@ -221,7 +221,7 @@
/// <summary>
- /// 鍞悗鐘舵��
+ /// 鏀惰揣鐘舵��
/// </summary>
[Display(Name = "鍞悗鐘舵��")]
@@ -278,8 +278,13 @@
public System.String shipAddress { get; set; }
-
-
+
+ /// <summary>
+ /// 鏀惰揣鍦板潃瀹氫綅
+ /// </summary>
+ [Display(Name = "鏀惰揣鍦板潃瀹氫綅")]
+ [SugarColumn(ColumnDescription = "鏀惰揣鍦板潃瀹氫綅",IsNullable = true)]
+ public System.String shipCoordinate { get; set; }
/// <summary>
/// 鏀惰揣浜哄鍚�
/// </summary>
@@ -543,11 +548,6 @@
/// 鏇存柊鏃堕棿
/// </summary>
[Display(Name = "鏇存柊鏃堕棿")]
-
-
-
-
-
public System.DateTime? updateTime { get; set; }
@@ -558,11 +558,25 @@
/// </summary>
[Display(Name = "璁″垝璁㈠崟id")]
-
[StringLength(maximumLength: 255, ErrorMessage = "{0}涓嶈兘瓒呰繃{1}瀛�")]
[SugarColumn(IsNullable = true)]
public System.String planorderId { get; set; }
+
+
+ /// <summary>
+ /// 鍙戝竷鑰卌msUserID
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍙戝竷鑰卌msUserID", IsNullable = true)]
+ public int? publisherId { get; set; }
+
+ /// <summary>
+ /// 鍘熻鍗旾D
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鍘熻鍗旾D", IsNullable = true)]
+ public string oldOderId { get; set; }
+
+
}
}
--
Gitblit v1.9.1