From a9d26b7c151f2727c9dc06a8236f2cf45a765cda Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 17 五月 2024 08:55:13 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.Configuration/GlobalEnumVars.cs | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/CoreCms.Net.Configuration/GlobalEnumVars.cs b/CoreCms.Net.Configuration/GlobalEnumVars.cs
index a7e4ab5..5b16d0a 100644
--- a/CoreCms.Net.Configuration/GlobalEnumVars.cs
+++ b/CoreCms.Net.Configuration/GlobalEnumVars.cs
@@ -72,6 +72,8 @@
鏈嶅姟璁㈠崟缂栧彿 = 10,
[Description("鏈嶅姟鍒稿厬鎹㈢爜")]
鏈嶅姟鍒稿厬鎹㈢爜 = 11,
+ [Description("璁″垝璁㈠崟缂栧彿")]
+ 璁″垝璁㈠崟缂栧彿 = 12,
}
/// <summary>
/// 鏉ユ簮
@@ -233,6 +235,18 @@
/// </summary>
[Description("鏃ュ巻绛惧埌")]
CheckIn = 10,
+
+ /// <summary>
+ /// 缁忛攢鍟嗕笟缁╂彁鎴�
+ /// </summary>
+ [Description("缁忛攢鍟嗕笟缁╂彁鎴�")]
+ DistributionAchievement = 11,
+
+ /// <summary>
+ /// 璁㈠崟
+ /// </summary>
+ [Description("璁㈠崟")]
+ GoodsOder = 11,
}
/// <summary>
/// 鐢ㄦ埛绉垎鍙樺姩鏉ユ簮绫诲瀷
@@ -647,6 +661,18 @@
TransactionComponent = 10,
}
+
+ /// <summary>
+ /// 璁″垝璁㈠崟鏄惁鎻愪氦
+ /// </summary>
+ public enum PlanOrderTiJiao
+ {
+ [Description("鏈攣鍗�")]
+ 鏈攣鍗� = 1,
+ [Description("宸查攣鍗�")]
+ 宸查攣鍗� = 2
+ }
+
/// <summary>
/// 鍙戣揣鍗曠姸鎬�
/// </summary>
@@ -999,7 +1025,12 @@
/// 浣欓鏀粯
/// </summary>
[Description("浣欓鏀粯")]
- balancepay = 4
+ balancepay = 4,
+ /// <summary>
+ /// 璁″垝璁㈠崟鏀粯
+ /// </summary>
+ [Description("璁″垝璁㈠崟鏀粯")]
+ planorderpay = 5
}
#endregion
@@ -2313,6 +2344,12 @@
/// </summary>
[Description("瀹℃牳鎷掔粷")]
VerifyRefuse = 3,
+
+ /// <summary>
+ /// 瀹℃牳鎷掔粷
+ /// </summary>
+ [Description("鍙栨秷璧勬牸")]
+ VerifyCancel = 4,
}
/// <summary>
/// 缁忛攢鍟嗚鍗曡褰曡〃鏄惁缁撶畻鐘舵��
--
Gitblit v1.9.1