From 5f4384bdab4697cc0a678fb17e55603a91a4750b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 四月 2024 08:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Configuration/GlobalEnumVars.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index ea958e7..8a15848 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -233,6 +233,18 @@
/// </summary>
[Description("鏃ュ巻绛惧埌")]
CheckIn = 10,
+
+ /// <summary>
+ /// 缁忛攢鍟嗕笟缁╂彁鎴�
+ /// </summary>
+ [Description("缁忛攢鍟嗕笟缁╂彁鎴�")]
+ DistributionAchievement = 11,
+
+ /// <summary>
+ /// 璁㈠崟
+ /// </summary>
+ [Description("璁㈠崟")]
+ GoodsOder = 11,
}
/// <summary>
/// 鐢ㄦ埛绉垎鍙樺姩鏉ユ簮绫诲瀷
@@ -2294,7 +2306,7 @@
#region 鍒嗛攢璁剧疆
/// <summary>
- /// 鍒嗛攢鍟嗙敵璇峰鏍哥姸鎬�
+ /// 缁忛攢鍟嗙敵璇峰鏍哥姸鎬�
/// </summary>
public enum DistributionVerifyStatus
{
@@ -2313,9 +2325,15 @@
/// </summary>
[Description("瀹℃牳鎷掔粷")]
VerifyRefuse = 3,
+
+ /// <summary>
+ /// 瀹℃牳鎷掔粷
+ /// </summary>
+ [Description("鍙栨秷璧勬牸")]
+ VerifyCancel = 4,
}
/// <summary>
- /// 鍒嗛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
+ /// 缁忛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
/// </summary>
public enum DistributionOrderSettlementStatus
@@ -2431,7 +2449,7 @@
}
/// <summary>
- /// 鎴愪负鍒嗛攢鍟嗘潯浠�
+ /// 鎴愪负缁忛攢鍟嗘潯浠�
/// </summary>
public enum DistributionConditionType
{
--
Gitblit v1.9.1