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/Good/CoreCmsGoods.cs | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs b/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs index 9c250fc..11bc208 100644 --- a/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs +++ b/CoreCms.Net.Model/Entities/Good/CoreCmsGoods.cs @@ -275,43 +275,55 @@ /// 瀹℃牳鐘舵�� /// </summary> [SugarColumn(ColumnDescription = "瀹℃牳鐘舵��", IsNullable = true)] - public AuditStatusTypoe? auditStatus { get; set; } + public AuditStatusType? auditStatus { get; set; } /// <summary> /// 瀹℃牳鏃堕棿 /// </summary> [SugarColumn(ColumnDescription = "瀹℃牳鏃堕棿", IsNullable = true)] public DateTime? auditTime { get; set; } + + + /// <summary> + /// 鎷掔粷鍘熷洜 + /// </summary> + [SugarColumn(ColumnDescription = "鎷掔粷鍘熷洜", IsNullable = true,Length =int.MaxValue)] + public string? auditRejectedReason { get; set; } } /// <summary> /// 瀹℃牳鐘舵�佹灇涓撅紝鐢ㄤ簬琛ㄧず涓嶅悓涓氬姟娴佺▼涓殑瀹℃牳鐘舵�併�� /// </summary> - public enum AuditStatusTypoe + public enum AuditStatusType { /// <summary> /// 寰呭鏍哥姸鎬侊紝琛ㄧず瀹℃牳灏氭湭寮�濮嬨�� /// </summary> + [Description("鏈鏍�")] Pending = 0, /// <summary> /// 宸叉壒鍑嗙姸鎬侊紝琛ㄧず瀹℃牳宸查�氳繃銆� /// </summary> + [Description("宸插鏍�")] Approved = 1, /// <summary> /// 宸叉嫆缁濈姸鎬侊紝琛ㄧず瀹℃牳鏈�氳繃銆� /// </summary> + [Description("宸叉嫆缁�")] Rejected = 2, /// <summary> /// 瀹℃牳杩涜涓姸鎬侊紝琛ㄧず瀹℃牳姝e湪澶勭悊涓�� /// </summary> + [Description("瀹℃牳杩涜涓�")] InProgress = 3, /// <summary> /// 宸插彇娑堢姸鎬侊紝琛ㄧず瀹℃牳宸茶鍙栨秷銆� /// </summary> + [Description("鍙栨秷")] Cancelled = 4 } } \ No newline at end of file -- Gitblit v1.9.1