From 2806ebdff9d11fbb5630d0ae6733dc586d8a455d Mon Sep 17 00:00:00 2001
From: KK <1985088337@qq.com>
Date: Sat, 18 Jul 2020 09:43:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E9=80=9A=E7=94=A8=E6=9E=9A?=
=?UTF-8?q?=E4=B8=BE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
OSS.Common/BasicMos/Enums/CommonStatus.cs | 17 +++++++++--------
OSS.Common/OSS.Common.csproj | 6 +++---
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/OSS.Common/BasicMos/Enums/CommonStatus.cs b/OSS.Common/BasicMos/Enums/CommonStatus.cs
index 2025bb6..72582e6 100644
--- a/OSS.Common/BasicMos/Enums/CommonStatus.cs
+++ b/OSS.Common/BasicMos/Enums/CommonStatus.cs
@@ -11,6 +11,7 @@
#endregion
using System;
+using OSS.Common.Extention;
namespace OSS.Common.BasicMos.Enums
{
@@ -21,23 +22,23 @@ namespace OSS.Common.BasicMos.Enums
public enum CommonStatus
{
///
- /// 删除标识 【软删除】
+ /// 删除
///
- Delete = -1000,
+ [OSDescript("已删除")] Deleted = -1000,
///
- /// 自定义扩展 【未生效】
+ /// 待激活
///
- UnActived = -100,
+ [OSDescript("待激活")] UnActived = -100,
///
- /// 默认初始状态
+ /// 正常
///
- Original = 0,
+ [OSDescript("正常")] Original = 0,
///
- /// 终结状态
+ /// 结束
///
- Finished = 10000
+ [OSDescript("已结束")] Finished = 10000
}
}
diff --git a/OSS.Common/OSS.Common.csproj b/OSS.Common/OSS.Common.csproj
index 8ff22c2..d425921 100644
--- a/OSS.Common/OSS.Common.csproj
+++ b/OSS.Common/OSS.Common.csproj
@@ -3,7 +3,7 @@
netstandard2.0
False
- 2.3.1.4
+ 2.3.1.5
false
OSSCore
OSSCore
@@ -14,8 +14,8 @@
https://github.com/KevinWG/OSS.Common
优化属性
- 2.3.1.4
- 2.3.1.4
+ 2.3.1.5
+ 2.3.1.5
https://github.com/KevinWG/OSS.Common/blob/master/LICENSE