解决冲突

QYZH.InteractiveMagazine.Models/Enum/AnswerStatusEnum.cs

@@ -3,38 +3,26 @@
 namespace QYZH.InteractiveMagazine.Models.Enum
 {
     /// <summary>
-    /// 答题状态枚举: 0-未答题，1-已答题，2-正确，3-半对，4-错误
+    /// 答题状态枚举: 10-已答题，20-进行中，30-已完成
     /// </summary>
     public enum AnswerStatusEnum
-    {
-        /// <summary>
-        /// 未答题
-        /// </summary>
-        [Description("未答题")]
-        None = 0,
-
+    { 
         /// <summary>
         /// 已答题
         /// </summary>
         [Description("已答题")]
-        Answer = 1,
+        Answer = 10,
 
         /// <summary>
-        /// 正确
+        /// 进行中
         /// </summary>
-        [Description("正确")]
-        Correct = 2,
+        [Description("进行中")]
+        Processing = 20,
 
         /// <summary>
-        /// 半对
+        /// 已完成
         /// </summary>
-        [Description("半对")]
-        HalfRight = 3,
-
-        /// <summary>
-        /// 错误
-        /// </summary>
-        [Description("错误")]
-        Error = 4
+        [Description("已完成")]
+        Complete = 30,
     }
 }