Merge branch 'feature/exam' into dev

合并冲突

src/Hotline.Share/Dtos/Sourcewares/SourcewareCategoryDto.cs

@@ -27,6 +27,12 @@ namespace Hotline.Share.Dtos.Sourcewares
         /// </summary>
         [Description("父级ID")]
         public string ParentId { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [Description("排序")]
+        public int? SortIndex { get; set; }
     }
 
     /// <summary>