Merge branch 'dev_1.0.2' of http://10.2.1.24:10244/Bpa.Software.Development/BPA.Common.Eums into dev_1.0.2

src/BPA.Common.Eums/Appreciation/IntegralEnum.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,9 +9,12 @@ namespace BPA.Common.Eums.Appreciation.Integ
 {
     public enum EnumCalculateType
     {
-        积分方案 = 1,
-        多倍积分 = 2,
-        独立计算 = 3
+        [Description("积分方案")]
+        scheme = 1,
+        [Description("加倍积分")]
+        doubleinteg = 2,
+        [Description("独立计算")]
+        independent = 3
     }
 
     /// <summary>
@@ -18,11 +22,14 @@ namespace BPA.Common.Eums.Appreciation.Integ
     /// </summary>
     public enum EnumIntegSourceType
     {
-
-        订单消费 = 1,
-        活动赠送 = 2,
-        后台补充 = 3,
-        积分兑换 = 4,
+        [Description("订单消费")]
+        consumption = 1,
+        [Description("活动赠送")]
+        activeGive = 2,
+        [Description("后台补充")]
+        backgroundAdd = 3,
+        [Description("积分兑换")]
+        integConversion = 4,
     }
 
     /// <summary>
@@ -30,12 +37,19 @@ namespace BPA.Common.Eums.Appreciation.Integ
     /// </summary>
     public enum EnumallTypes
     {
+        [Description("公共方案")]
         common = 0,
+        [Description("消费金额")]
         price = 1,
+        [Description("大类")]
         big = 2,
+        [Description("小类")]
         small = 3,
+        [Description("消费数量")]
         count = 4,
+        [Description("消费人数")]
         persons = 5,
+        [Description("出品数量")]
         number = 6
     }
 }

src/BPA.Common.Eums/Order/OrderEnum.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -8,11 +9,17 @@ namespace BPA.Common.Eums.Order
 {
     public enum EnumSubOrderCookingStutas
     {
+        [Description("等待制作")]
         WaitMake = 0,
+        [Description("制作中")]
         Making = 1,
+        [Description("等待取餐")]
         WaitTake = 2,
+        [Description("出餐完成")]
         TakeCompleted = 3,
+        [Description("正常")]
         Normal = 99998,
+        [Description("错误")]
         Error = 99999
     }
 }