修复字典类型和字典数据没有生成主键数据的问题

Admin.Core.Repository/Admin/Dictionary/Output/DictionaryDataOutput.cs

@@ -12,6 +12,11 @@ namespace Admin.Core.Repository.Admin.Output
         /// </summary>
         public long? TenantId { get; set; }
 
+        /// <summary>
+        /// 字典Id
+        /// </summary>
+        public long Id { get; set; }
+
         /// <summary>
         /// 字典类型Id
         /// </summary>

Admin.Core.Repository/Admin/DictionaryType/Output/DictionaryTypeDataOutput.cs

@@ -12,6 +12,11 @@ namespace Admin.Core.Repository.Admin.Output
         /// </summary>
         public long? TenantId { get; set; }
 
+        /// <summary>
+        /// 字典类型Id
+        /// </summary>
+        public long Id { get; set; }
+
         /// <summary>
         /// 字典名称
         /// </summary>

Admin.Core.Repository/Base/Data.cs

@@ -8,8 +8,8 @@ namespace Admin.Core.Repository
     /// </summary>
     public class Data
     {
-        public DictionaryEntity[] Dictionaries { get; set; }
         public DictionaryTypeEntity[] DictionaryTypes { get; set; }
+        public DictionaryEntity[] Dictionaries { get; set; }
         public ApiEntity[] Apis { get; set; }
         public ApiEntity[] ApiTree { get; set; }
         public ViewEntity[] ViewTree { get; set; }

Admin.Core.Repository/Base/DbHelper.cs

@@ -414,8 +414,8 @@ namespace Admin.Core.Repository
                     }
 
                     //admin
-                    await InitDtDataAsync(db, uow, tran, data.Dictionaries, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.DictionaryTypes, dbConfig);
+                    await InitDtDataAsync(db, uow, tran, data.Dictionaries, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.ApiTree, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.ViewTree, dbConfig);
                     await InitDtDataAsync(db, uow, tran, data.PermissionTree, dbConfig);
@@ -460,9 +460,9 @@ namespace Admin.Core.Repository
 
                 //admin
                 #region 数据字典
-                var dictionaries = await db.Queryable<DictionaryEntity>().ToListAsync<DictionaryDataOutput>();
-
+                
                 var dictionaryTypes = await db.Queryable<DictionaryTypeEntity>().ToListAsync<DictionaryTypeDataOutput>();
+                var dictionaries = await db.Queryable<DictionaryEntity>().ToListAsync<DictionaryDataOutput>();
 
                 #endregion