导出数据重做，新增NotGenAttribute特性实现导出数据不导出此属性，改用System.Text.Json序列化数据

Entity<TKey> 和 EntityTenant<TKey>优化支持Newtonsoft.Json和System.Text.Json序列化排序
ZhonTai.Common库新增EntityHelper实体帮助类和InterfaceHelper接口帮助类
优化初始化数据修改数据在新增数据前面的问题

src/hosts/ZhonTai.Host/InitData/Admin/ad_dict.json

@@ -2,7 +2,6 @@
   {
     "id": 187395320303685,
     "dictTypeId": 187395320434757,
-    "dictType": null,
     "name": "男",
     "code": "male",
     "value": "1",
@@ -10,17 +9,16 @@
     "enabled": true,
     "sort": 1,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 187395320369221,
     "dictTypeId": 187395320434757,
-    "dictType": null,
     "name": "女",
     "code": "female",
     "value": "2",
@@ -28,11 +26,11 @@
     "enabled": true,
     "sort": 2,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_dict_type.json

@@ -7,11 +7,11 @@
     "enabled": true,
     "sort": 1,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_org.json

@@ -9,16 +9,13 @@
     "enabled": true,
     "sort": 1,
     "description": "",
-    "staffs": null,
-    "users": null,
-    "roles": null,
     "childs": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_org.tenant.json

@@ -10,16 +10,13 @@
     "enabled": true,
     "sort": 1,
     "description": "",
-    "staffs": null,
-    "users": null,
-    "roles": null,
     "childs": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_permission_api.json

@@ -2,1411 +2,1169 @@
   {
     "id": 171039545122886,
     "permissionId": 161227168657477,
-    "permission": null,
     "apiId": 161227168174149,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171039733657671,
     "permissionId": 161227168657478,
-    "permission": null,
     "apiId": 161227168170054,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171039733657672,
     "permissionId": 161227168657478,
-    "permission": null,
     "apiId": 161227168178245,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171039848452166,
     "permissionId": 161227168669766,
-    "permission": null,
     "apiId": 161227168116805,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171039883370566,
     "permissionId": 161227168673861,
-    "permission": null,
     "apiId": 161227168120901,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171039935344711,
     "permissionId": 161227168673862,
-    "permission": null,
     "apiId": 161227168079941,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171039935344712,
     "permissionId": 161227168673862,
-    "permission": null,
     "apiId": 161227168120902,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040100655174,
     "permissionId": 161227168682053,
-    "permission": null,
     "apiId": 161227168124998,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040178724934,
     "permissionId": 161227168686150,
-    "permission": null,
     "apiId": 161227168198726,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040219164742,
     "permissionId": 161227168690245,
-    "permission": null,
     "apiId": 161227168202822,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040256553031,
     "permissionId": 161227168690246,
-    "permission": null,
     "apiId": 161227168198725,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040256553032,
     "permissionId": 161227168690246,
-    "permission": null,
     "apiId": 161227168202823,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040379768902,
     "permissionId": 161227168698437,
-    "permission": null,
     "apiId": 161227168206919,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171040930574406,
     "permissionId": 161227168702534,
-    "permission": null,
     "apiId": 161227168141383,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171041051480134,
     "permissionId": 161227168706629,
-    "permission": null,
     "apiId": 161227168153669,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171041379016773,
     "permissionId": 161227168714821,
-    "permission": null,
     "apiId": 161227168145478,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171041379016774,
     "permissionId": 161227168714821,
-    "permission": null,
     "apiId": 161227168157766,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171041490071623,
     "permissionId": 161227168710726,
-    "permission": null,
     "apiId": 161227168145477,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171041490071624,
     "permissionId": 161227168710726,
-    "permission": null,
     "apiId": 161227168157765,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171042505658439,
     "permissionId": 161227168747590,
-    "permission": null,
     "apiId": 161227168211013,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171042505658440,
     "permissionId": 161227168747590,
-    "permission": null,
     "apiId": 161227168211014,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171044112568390,
     "permissionId": 161227168747589,
-    "permission": null,
     "apiId": 161227168211013,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
-  },
-  {
-    "id": 171044276404294,
-    "permissionId": 161227168751686,
-    "permission": null,
-    "apiId": 161227168243782,
-    "api": null,
-    "createdUserId": 161223411986501,
-    "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171045341298758,
     "permissionId": 161227168784454,
-    "permission": null,
     "apiId": 161227168215109,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 171045383643206,
     "permissionId": 161227168788550,
-    "permission": null,
     "apiId": 161227168215110,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 185974955921477,
     "permissionId": 161227168821318,
-    "permission": null,
     "apiId": 161227168215111,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 185974955921478,
     "permissionId": 161227168821318,
-    "permission": null,
     "apiId": 161227168235589,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187390759231560,
     "permissionId": 187389970825285,
-    "permission": null,
     "apiId": 161227168137285,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187390759231561,
     "permissionId": 187389970825285,
-    "permission": null,
     "apiId": 161227168141381,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187390759231562,
     "permissionId": 187389970825285,
-    "permission": null,
     "apiId": 174219034734661,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187390759231563,
     "permissionId": 187389970825285,
-    "permission": null,
     "apiId": 174219034734664,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187390793699399,
     "permissionId": 187375358951493,
-    "permission": null,
     "apiId": 161227168137286,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187390793703493,
     "permissionId": 187375358951493,
-    "permission": null,
     "apiId": 174219034734662,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187391371079750,
     "permissionId": 187391371018309,
-    "permission": null,
     "apiId": 184100551516229,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187391371079751,
     "permissionId": 187391371018309,
-    "permission": null,
     "apiId": 184100551532613,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187391980814407,
     "permissionId": 187391980761157,
-    "permission": null,
     "apiId": 161227168137287,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 187391980814408,
     "permissionId": 187391980761157,
-    "permission": null,
     "apiId": 174219034734663,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188054656598086,
     "permissionId": 188054656589893,
-    "permission": null,
     "apiId": 174219034738760,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188054719275078,
     "permissionId": 188054719266885,
-    "permission": null,
     "apiId": 174219034738761,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188054776557639,
     "permissionId": 188054776545349,
-    "permission": null,
     "apiId": 174219034738759,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188054776557640,
     "permissionId": 188054776545349,
-    "permission": null,
     "apiId": 174219034738762,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188054835359813,
     "permissionId": 188054834004037,
-    "permission": null,
     "apiId": 174219034738763,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188799732666437,
     "permissionId": 188799732494405,
-    "permission": null,
     "apiId": 174219034734667,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188799795204165,
     "permissionId": 188799795101765,
-    "permission": null,
     "apiId": 174219034734668,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188799878713413,
     "permissionId": 188799878676549,
-    "permission": null,
     "apiId": 174219034734666,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188799878713414,
     "permissionId": 188799878676549,
-    "permission": null,
     "apiId": 174219034734669,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188799949889606,
     "permissionId": 188799949844549,
-    "permission": null,
     "apiId": 174219034734670,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 188799997497414,
     "permissionId": 188799997452357,
-    "permission": null,
     "apiId": 174219034734671,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 189345990312005,
     "permissionId": 189345990168645,
-    "permission": null,
     "apiId": 174219034738764,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 340637112541253,
     "permissionId": 161227168653382,
-    "permission": null,
     "apiId": 336555241422917,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 340637112541254,
     "permissionId": 161227168653382,
-    "permission": null,
     "apiId": 336555241422918,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 342275178242117,
     "permissionId": 161227168641093,
-    "permission": null,
     "apiId": 161227168186437,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 342275178246213,
     "permissionId": 161227168641093,
-    "permission": null,
     "apiId": 188049296683077,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750459183173,
     "permissionId": 161227168641094,
-    "permission": null,
     "apiId": 336555241422917,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750459183174,
     "permissionId": 161227168641094,
-    "permission": null,
     "apiId": 161227168186437,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750459183175,
     "permissionId": 161227168641094,
-    "permission": null,
     "apiId": 161227168186438,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750459183176,
     "permissionId": 161227168641094,
-    "permission": null,
     "apiId": 188049296683077,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750499344453,
     "permissionId": 161227168645189,
-    "permission": null,
     "apiId": 336555241422917,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750499344454,
     "permissionId": 161227168645189,
-    "permission": null,
     "apiId": 161227168182343,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750499344455,
     "permissionId": 161227168645189,
-    "permission": null,
     "apiId": 161227168186437,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750499344456,
     "permissionId": 161227168645189,
-    "permission": null,
     "apiId": 161227168190533,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 349750499344457,
     "permissionId": 161227168645189,
-    "permission": null,
     "apiId": 188049296683077,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360708999491653,
     "permissionId": 349749778899013,
-    "permission": null,
     "apiId": 349749396619333,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709017350213,
     "permissionId": 349749511946309,
-    "permission": null,
     "apiId": 349749396615237,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709080879173,
     "permissionId": 340890474405957,
-    "permission": null,
     "apiId": 336555241422919,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709080879174,
     "permissionId": 340890474405957,
-    "permission": null,
     "apiId": 0,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709080879175,
     "permissionId": 340890474405957,
-    "permission": null,
     "apiId": 188049296683077,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709099552837,
     "permissionId": 340890633515077,
-    "permission": null,
     "apiId": 336555241422920,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709121323077,
     "permissionId": 340645133123653,
-    "permission": null,
     "apiId": 161227168149574,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709121327173,
     "permissionId": 340645133123653,
-    "permission": null,
     "apiId": 161227168149575,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709121327174,
     "permissionId": 340645133123653,
-    "permission": null,
     "apiId": 161227168165957,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709189963845,
     "permissionId": 188054258278469,
-    "permission": null,
     "apiId": 188049296683077,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709215817797,
     "permissionId": 188054341582917,
-    "permission": null,
     "apiId": 174219034734674,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709237321797,
     "permissionId": 188054416891973,
-    "permission": null,
     "apiId": 174219034734672,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709237325893,
     "permissionId": 188054416891973,
-    "permission": null,
     "apiId": 174219034738757,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709600628805,
     "permissionId": 161227168731205,
-    "permission": null,
     "apiId": 161227168165958,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709600628806,
     "permissionId": 161227168731205,
-    "permission": null,
     "apiId": 161227168170053,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709844901957,
     "permissionId": 161227168706630,
-    "permission": null,
     "apiId": 161227168153670,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360709952303173,
     "permissionId": 161227168727110,
-    "permission": null,
     "apiId": 161227168165959,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710163017797,
     "permissionId": 343343120306245,
-    "permission": null,
     "apiId": 336555241427013,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710186348613,
     "permissionId": 343342945812549,
-    "permission": null,
     "apiId": 336555241422922,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710210654277,
     "permissionId": 343344363630661,
-    "permission": null,
     "apiId": 336555241427018,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710378074181,
     "permissionId": 343343209164869,
-    "permission": null,
     "apiId": 336555241427014,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710409134149,
     "permissionId": 343343735894085,
-    "permission": null,
     "apiId": 336555241422922,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710409134150,
     "permissionId": 343343735894085,
-    "permission": null,
     "apiId": 336555241427015,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710429880389,
     "permissionId": 343344158351429,
-    "permission": null,
     "apiId": 336555241427016,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710497280069,
     "permissionId": 343343989960773,
-    "permission": null,
     "apiId": 343342310703173,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710512681029,
     "permissionId": 343343926595653,
-    "permission": null,
     "apiId": 343342310699077,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710534180933,
     "permissionId": 343344066166853,
-    "permission": null,
     "apiId": 343342310703174,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710689267781,
     "permissionId": 161227168833605,
-    "permission": null,
     "apiId": 161227168239685,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710797463621,
     "permissionId": 161227168800838,
-    "permission": null,
     "apiId": 161227168223302,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710817820741,
     "permissionId": 161227168804933,
-    "permission": null,
     "apiId": 161227168227397,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710880665669,
     "permissionId": 161227168809029,
-    "permission": null,
     "apiId": 161227168219205,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710880665670,
     "permissionId": 161227168809029,
-    "permission": null,
     "apiId": 161227168227398,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710901760069,
     "permissionId": 161227168813125,
-    "permission": null,
     "apiId": 161227168219206,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360710901760070,
     "permissionId": 161227168813125,
-    "permission": null,
     "apiId": 161227168231493,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360711132024901,
     "permissionId": 161227168825414,
-    "permission": null,
     "apiId": 161227168235589,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 360711132024902,
     "permissionId": 161227168825414,
-    "permission": null,
     "apiId": 161227168235590,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 363544618700869,
     "permissionId": 161227168813126,
-    "permission": null,
     "apiId": 161227168231494,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 363544634417221,
     "permissionId": 161227168833606,
-    "permission": null,
     "apiId": 161227168239686,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 363544652439621,
     "permissionId": 161227168829509,
-    "permission": null,
     "apiId": 161227168235591,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372004983631941,
     "permissionId": 372004430860357,
-    "permission": null,
     "apiId": 371292589764677,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372387123470405,
     "permissionId": 161227168649285,
-    "permission": null,
     "apiId": 336555241427019,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372387205976133,
     "permissionId": 161227168645190,
-    "permission": null,
     "apiId": 271618651926607,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372387273650245,
     "permissionId": 161227168661573,
-    "permission": null,
     "apiId": 271618651926604,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372387357708357,
     "permissionId": 161227168665669,
-    "permission": null,
     "apiId": 336555241422921,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372387722547269,
     "permissionId": 188054509027397,
-    "permission": null,
     "apiId": 342274923528261,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372387852169285,
     "permissionId": 161227168718917,
-    "permission": null,
     "apiId": 187384805367877,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372388163334213,
     "permissionId": 161227168759877,
-    "permission": null,
     "apiId": 163579785756741,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372389074755653,
     "permissionId": 187390547820613,
-    "permission": null,
     "apiId": 271618651926597,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372389074755654,
     "permissionId": 187390547820613,
-    "permission": null,
     "apiId": 271618651922504,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372393512312901,
     "permissionId": 372031447494725,
-    "permission": null,
     "apiId": 372031353708613,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372398462337093,
     "permissionId": 372004589551685,
-    "permission": null,
     "apiId": 371678435708997,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372398462349381,
     "permissionId": 372004589551685,
-    "permission": null,
     "apiId": 371678435725381,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372400081883205,
     "permissionId": 161227168677957,
-    "permission": null,
     "apiId": 271618651914309,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372400964571205,
     "permissionId": 161227168677958,
-    "permission": null,
     "apiId": 372400615755845,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372401035112517,
     "permissionId": 161227168694341,
-    "permission": null,
     "apiId": 271618651926608,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 372401476096069,
     "permissionId": 161227168694342,
-    "permission": null,
     "apiId": 372401403850821,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 394676138577989,
     "permissionId": 394672570462277,
-    "permission": null,
     "apiId": 394672333692997,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 394676175425605,
     "permissionId": 394672685342789,
-    "permission": null,
     "apiId": 394672333688901,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402840520056901,
     "permissionId": 402840520048709,
-    "permission": null,
     "apiId": 402830164914252,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402840869609541,
     "permissionId": 402840869605445,
-    "permission": null,
     "apiId": 402830164914249,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402843803623493,
     "permissionId": 402840810463301,
-    "permission": null,
     "apiId": 402830164914248,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402843803623494,
     "permissionId": 402840810463301,
-    "permission": null,
     "apiId": 161227168243782,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402846230683717,
     "permissionId": 161807358345285,
-    "permission": null,
     "apiId": 170317848645701,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402846230696005,
     "permissionId": 161807358345285,
-    "permission": null,
     "apiId": 170317848662085,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402846230696006,
     "permissionId": 161807358345285,
-    "permission": null,
     "apiId": 161227168149574,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402846305517637,
     "permissionId": 402843985313861,
-    "permission": null,
     "apiId": 402830164914247,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402846305521733,
     "permissionId": 402843985313861,
-    "permission": null,
     "apiId": 161227168149574,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 402846305521734,
     "permissionId": 402843985313861,
-    "permission": null,
     "apiId": 402830164914246,
-    "api": null,
-    "createdUserId": 161223411986501,
-    "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
-  },
-  {
-    "id": 402846474514501,
-    "permissionId": 402838978203717,
-    "permission": null,
-    "apiId": 402830164910151,
-    "api": null,
-    "createdUserId": 161223411986501,
-    "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
-  },
-  {
-    "id": 402846474514502,
-    "permissionId": 402838978203717,
-    "permission": null,
-    "apiId": 402830164910152,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
-  },
-  {
-    "id": 402846474514503,
-    "permissionId": 402838978203717,
-    "permission": null,
-    "apiId": 402830164914245,
-    "api": null,
-    "createdUserId": 161223411986501,
-    "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174061850693,
     "permissionId": 402839687192645,
-    "permission": null,
     "apiId": 402830164914250,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:19:29"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174104182853,
     "permissionId": 402840395829317,
-    "permission": null,
     "apiId": 402830164914251,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:19:39"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174104182854,
     "permissionId": 402840395829317,
-    "permission": null,
     "apiId": 402830164910150,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:19:39"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174168866885,
     "permissionId": 161227168755781,
-    "permission": null,
     "apiId": 161227168243783,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:19:55"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174168866886,
     "permissionId": 161227168755781,
-    "permission": null,
     "apiId": 402830164910151,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:19:55"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174230675525,
     "permissionId": 161227168755782,
-    "permission": null,
     "apiId": 161227168243781,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:20:10"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174230675526,
     "permissionId": 161227168755782,
-    "permission": null,
     "apiId": 161227168247877,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:20:10"
+    "createdTime": "2023-04-13T15:13:43"
   },
   {
     "id": 403174230675527,
     "permissionId": 161227168755782,
-    "permission": null,
     "apiId": 402830164910151,
-    "api": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:20:10"
+    "createdTime": "2023-04-13T15:13:43"
+  },
+  {
+    "id": 406343893172293,
+    "permissionId": 402838978203717,
+    "apiId": 402830164910151,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:17:34"
+  },
+  {
+    "id": 406343893180485,
+    "permissionId": 402838978203717,
+    "apiId": 402830164910152,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:17:34"
+  },
+  {
+    "id": 406343893180486,
+    "permissionId": 402838978203717,
+    "apiId": 402830164914245,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:17:34"
+  },
+  {
+    "id": 406343893180487,
+    "permissionId": 402838978203717,
+    "apiId": 402830164910150,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:17:34"
+  },
+  {
+    "id": 406343893180488,
+    "permissionId": 402838978203717,
+    "apiId": 403173446250565,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:17:34"
+  },
+  {
+    "id": 406343893180489,
+    "permissionId": 402838978203717,
+    "apiId": 402830164914246,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:17:34"
+  },
+  {
+    "id": 406344832528453,
+    "permissionId": 161227168751686,
+    "apiId": 161227168243782,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:21:23"
+  },
+  {
+    "id": 406344832528454,
+    "permissionId": 161227168751686,
+    "apiId": 161227168243781,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:21:23"
+  },
+  {
+    "id": 406344832528455,
+    "permissionId": 161227168751686,
+    "apiId": 170317848645701,
+    "createdUserId": 161223411986501,
+    "createdUserName": "admin",
+    "createdTime": "2023-04-13T15:21:23"
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_role.json

@@ -10,16 +10,13 @@
     "description": "",
     "hidden": false,
     "sort": 1,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 162605510979653,
@@ -32,16 +29,13 @@
     "description": "",
     "hidden": false,
     "sort": 3,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 336557474730053,
@@ -54,16 +48,13 @@
     "description": null,
     "hidden": false,
     "sort": 1,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 336557508276293,
@@ -76,16 +67,13 @@
     "description": null,
     "hidden": false,
     "sort": 2,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 336557578817605,
@@ -98,16 +86,13 @@
     "description": null,
     "hidden": false,
     "sort": 3,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 340428577087557,
@@ -120,15 +105,12 @@
     "description": "",
     "hidden": false,
     "sort": 2,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_role.tenant.json

@@ -11,16 +11,13 @@
     "description": "",
     "hidden": false,
     "sort": 1,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 162605510979653,
@@ -34,16 +31,13 @@
     "description": "",
     "hidden": false,
     "sort": 3,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 336557474730053,
@@ -57,16 +51,13 @@
     "description": null,
     "hidden": false,
     "sort": 1,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 336557508276293,
@@ -80,16 +71,13 @@
     "description": null,
     "hidden": false,
     "sort": 2,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 336557578817605,
@@ -103,16 +91,13 @@
     "description": null,
     "hidden": false,
     "sort": 3,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 340428577087557,
@@ -126,15 +111,12 @@
     "description": "",
     "hidden": false,
     "sort": 2,
-    "users": null,
-    "orgs": null,
-    "permissions": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_tenant.json

@@ -2,22 +2,19 @@
   {
     "id": 161223412138053,
     "userId": 161223411986501,
-    "user": null,
     "orgId": 189097691009093,
-    "org": null,
     "tenantType": 1,
     "dbKey": "masterdb",
     "dbType": null,
     "connectionString": "",
     "enabled": true,
     "description": "",
-    "pkgs": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.json

@@ -1,7 +1,6 @@
 [
   {
     "id": 161223411986501,
-    "tenant": null,
     "userName": "admin",
     "password": "96E79218965EB72C92A549DD5A330112",
     "passwordEncryptType": null,
@@ -9,23 +8,18 @@
     "mobile": "13122223333",
     "email": "xiaoxue@zhontai.com",
     "orgId": 189097691009093,
-    "org": null,
     "managerUserId": null,
-    "managerUser": null,
     "nickName": "小雪转中雪",
     "avatar": null,
     "status": null,
     "type": 100,
     "enabled": true,
-    "roles": null,
-    "orgs": null,
-    "staff": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user.tenant.json

@@ -2,7 +2,6 @@
   {
     "id": 161223411986501,
     "tenantId": 161223412138053,
-    "tenant": null,
     "userName": "admin",
     "password": "96E79218965EB72C92A549DD5A330112",
     "passwordEncryptType": null,
@@ -10,23 +9,18 @@
     "mobile": "13122223333",
     "email": "xiaoxue@zhontai.com",
     "orgId": 189097691009093,
-    "org": null,
     "managerUserId": null,
-    "managerUser": null,
     "nickName": "小雪转中雪",
     "avatar": null,
     "status": null,
     "type": 100,
     "enabled": true,
-    "roles": null,
-    "orgs": null,
-    "staff": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user_org.json

@@ -2,15 +2,13 @@
   {
     "id": 371677390377029,
     "userId": 161223411986501,
-    "user": null,
     "orgId": 189097691009093,
-    "org": null,
     "isManager": true,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user_role.json

@@ -2,11 +2,9 @@
   {
     "id": 371677390233669,
     "userId": 161223411986501,
-    "user": null,
     "roleId": 161223412080709,
-    "role": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43"
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user_staff.json

@@ -8,11 +8,11 @@
     "workWeChatCard": null,
     "introduce": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_user_staff.tenant.json

@@ -9,11 +9,11 @@
     "workWeChatCard": null,
     "introduce": null,
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/InitData/Admin/ad_view.json

@@ -22,12 +22,12 @@
         "enabled": true,
         "childs": [],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       },
       {
         "id": 161227168432197,
@@ -52,12 +52,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168444485,
@@ -71,12 +71,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168448582,
@@ -90,12 +90,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168456774,
@@ -109,12 +109,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 187053736300613,
@@ -128,12 +128,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 336556164300869,
@@ -147,12 +147,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 371247502852165,
@@ -166,21 +166,21 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           }
         ],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       },
       {
         "id": 161227168436293,
@@ -194,12 +194,12 @@
         "enabled": true,
         "childs": [],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       },
       {
         "id": 161227168436294,
@@ -224,12 +224,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168440389,
@@ -243,12 +243,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168444486,
@@ -262,12 +262,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168448583,
@@ -281,12 +281,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 174312361087045,
@@ -300,12 +300,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 402829224460357,
@@ -319,21 +319,21 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           }
         ],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       },
       {
         "id": 161227168452677,
@@ -358,12 +358,12 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           },
           {
             "id": 161227168456773,
@@ -377,30 +377,30 @@
             "enabled": true,
             "childs": null,
             "isDeleted": false,
-            "modifiedUserId": null,
-            "modifiedUserName": null,
-            "modifiedTime": null,
             "createdUserId": 161223411986501,
             "createdUserName": "admin",
-            "createdTime": "2023-04-04T16:16:47"
+            "createdTime": "2023-04-13T15:13:43",
+            "modifiedUserId": null,
+            "modifiedUserName": null,
+            "modifiedTime": null
           }
         ],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       }
     ],
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   },
   {
     "id": 361047466754117,
@@ -425,12 +425,12 @@
         "enabled": true,
         "childs": [],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       },
       {
         "id": 361047841796165,
@@ -444,20 +444,20 @@
         "enabled": true,
         "childs": [],
         "isDeleted": false,
-        "modifiedUserId": null,
-        "modifiedUserName": null,
-        "modifiedTime": null,
         "createdUserId": 161223411986501,
         "createdUserName": "admin",
-        "createdTime": "2023-04-04T16:16:47"
+        "createdTime": "2023-04-13T15:13:43",
+        "modifiedUserId": null,
+        "modifiedUserName": null,
+        "modifiedTime": null
       }
     ],
     "isDeleted": false,
-    "modifiedUserId": null,
-    "modifiedUserName": null,
-    "modifiedTime": null,
     "createdUserId": 161223411986501,
     "createdUserName": "admin",
-    "createdTime": "2023-04-04T16:16:47"
+    "createdTime": "2023-04-13T15:13:43",
+    "modifiedUserId": null,
+    "modifiedUserName": null,
+    "modifiedTime": null
   }
 ]

src/hosts/ZhonTai.Host/Program.cs

@@ -18,21 +18,21 @@ new HostApp(new HostAppOptions
     //配置FreeSql
     ConfigureFreeSql = (freeSql, dbConfig) =>
     {
-        if(dbConfig.Key == DbKeys.AppDb)
-        {
-            freeSql.SyncSchedulerStructure(dbConfig, (fsql) =>
-            {
-                fsql.CodeFirst
-                .ConfigEntity<TaskInfo>(a =>
-                {
-                    a.Name("app_task");
-                })
-                .ConfigEntity<TaskLog>(a =>
-                {
-                    a.Name("app_task_log");
-                });
-            });
-        }
+        //if(dbConfig.Key == DbKeys.AppDb)
+        //{
+        //    freeSql.SyncSchedulerStructure(dbConfig, (fsql) =>
+        //    {
+        //        fsql.CodeFirst
+        //        .ConfigEntity<TaskInfo>(a =>
+        //        {
+        //            a.Name("app_task");
+        //        })
+        //        .ConfigEntity<TaskLog>(a =>
+        //        {
+        //            a.Name("app_task_log");
+        //        });
+        //    });
+        //}
     },
 
 	//配置后置服务
@@ -66,24 +66,24 @@ new HostApp(new HostAppOptions
         }).AddSubscriberAssembly(assemblies);
 
         //添加任务调度
-        context.Services.AddTaskScheduler(DbKeys.AppDb, options =>
-        {
-            options.ConfigureFreeSql = freeSql =>
-            {
-                freeSql.CodeFirst
-                .ConfigEntity<TaskInfo>(a =>
-                {
-                    a.Name("app_task");
-                })
-                .ConfigEntity<TaskLog>(a =>
-                {
-                    a.Name("app_task_log");
-                });
-            };
+        //context.Services.AddTaskScheduler(DbKeys.AppDb, options =>
+        //{
+        //    options.ConfigureFreeSql = freeSql =>
+        //    {
+        //        freeSql.CodeFirst
+        //        .ConfigEntity<TaskInfo>(a =>
+        //        {
+        //            a.Name("app_task");
+        //        })
+        //        .ConfigEntity<TaskLog>(a =>
+        //        {
+        //            a.Name("app_task_log");
+        //        });
+        //    };
 
-            //模块任务处理器
-            options.TaskHandler = new CloudTaskHandler(options.FreeSqlCloud, DbKeys.AppDb);
-        });
+        //    //模块任务处理器
+        //    options.TaskHandler = new CloudTaskHandler(options.FreeSqlCloud, DbKeys.AppDb);
+        //});
     },
 
     //配置Autofac容器

src/platform/ZhonTai.Admin/Core/Attributes/NotGenAttribute.cs

@@ -0,0 +1,11 @@
+using System;
+
+namespace ZhonTai.Admin.Core.Attributes;
+
+/// <summary>
+/// 不生成特性
+/// </summary>
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field, AllowMultiple = false)]
+public class NotGenAttribute : Attribute
+{
+}

src/platform/ZhonTai.Admin/Core/Db/DBServiceCollectionExtensions.cs

@@ -43,6 +43,8 @@ public static class DBServiceCollectionExtensions
         //定义基础仓储主库
         var fsql = freeSqlCloud.Use(dbConfig.Key);
         services.AddSingleton(provider => fsql);
+        //运行数据库注册方法
+        fsql.Select<object>();
     }
 
     /// <summary>

src/platform/ZhonTai.Admin/Core/Db/Data/GenerateData.cs

@@ -1,27 +1,54 @@
 using System.Linq;
 using System.IO;
-using System.Collections.Generic;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
+using System.Text.Json;
 using FreeSql.DataAnnotations;
 using ZhonTai.Common.Helpers;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
+using ZhonTai.Admin.Core.Attributes;
+using System.Text.Json.Serialization.Metadata;
+using ZhonTai.Admin.Core.Entities;
 
 namespace ZhonTai.Admin.Core.Db.Data;
 
 public abstract class GenerateData
 {
-    protected virtual void SaveDataToJsonFile<T>(object data, bool isTenant = false, string path = "InitData/Admin", PropsContractResolver propsContractResolver = null) where T : class, new()
+    private readonly string _tenantName = InterfaceHelper.GetPropertyNames<ITenant>().FirstOrDefault()?.ToLower();
+
+    protected virtual void IgnorePropName(JsonTypeInfo ti, bool isTenant)
+    {
+        foreach(var jsonPropertyInfo in ti.Properties)
+        {
+            jsonPropertyInfo.ShouldSerialize = (obj, _) =>
+            {
+                if (jsonPropertyInfo.Name.ToLower() == _tenantName && EntityHelper.IsImplementInterface(ti.Type, typeof(ITenant)))
+                {
+                    return isTenant;
+                }
+
+                return !jsonPropertyInfo.AttributeProvider.IsDefined(typeof(NotGenAttribute), false);
+            };
+        }
+    }
+
+    protected virtual void SaveDataToJsonFile<T>(object data, bool isTenant = false, string path = "InitData/Admin") where T : class, new()
     {
-        var settings = new JsonSerializerSettings
+        var jsonSerializerOptions = new JsonSerializerOptions
         {
-            ContractResolver = propsContractResolver ?? (isTenant ? new CamelCasePropertyNamesContractResolver() : new PropsContractResolver(new List<string> { "TenantId" }))
+            WriteIndented = true,
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            Encoder = JavaScriptEncoder.Create(new TextEncoderSettings(UnicodeRanges.All)),
+            TypeInfoResolver = new DefaultJsonTypeInfoResolver
+            {
+                Modifiers = { (JsonTypeInfo ti) => IgnorePropName(ti, isTenant) }
+            }
         };
-        //settings.NullValueHandling = NullValueHandling.Ignore;
-        //settings.DefaultValueHandling = DefaultValueHandling.Ignore;
 
         var table = typeof(T).GetCustomAttributes(typeof(TableAttribute), false).FirstOrDefault() as TableAttribute;
         var filePath = Path.Combine(Directory.GetCurrentDirectory(), $"{path}/{table.Name}{(isTenant ? ".tenant" : "")}.json").ToPath();
-        var jsonData = JsonConvert.SerializeObject(data, Formatting.Indented, settings);
+
+        var jsonData = JsonSerializer.Serialize(data, jsonSerializerOptions);
+
         FileHelper.WriteFile(filePath, jsonData);
     }
 }

src/platform/ZhonTai.Admin/Core/Entities/Entity.cs

@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using Newtonsoft.Json;
 using System.ComponentModel;
+using System.Text.Json.Serialization;
 using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Core.Entities;
@@ -26,6 +27,7 @@ public class Entity<TKey> : IEntity<TKey>
     [Snowflake]
     [Column(Position = 1, IsIdentity = false, IsPrimary = true)]
     [JsonProperty(Order = -30)]
+    [JsonPropertyOrder(-30)]
     public virtual TKey Id { get; set; }
 }
 

src/platform/ZhonTai.Admin/Core/Entities/EntityTenant.cs

@@ -1,6 +1,7 @@
 using FreeSql.DataAnnotations;
 using Newtonsoft.Json;
 using System.ComponentModel;
+using System.Text.Json.Serialization;
 
 namespace ZhonTai.Admin.Core.Entities;
 
@@ -15,6 +16,7 @@ public class EntityTenant<TKey> : EntityBase, ITenant
     [Description("租户Id")]
     [Column(Position = 2, CanUpdate = false)]
     [JsonProperty(Order = -20)]
+    [JsonPropertyOrder(-20)]
     public virtual long? TenantId { get; set; }
 }
 

src/platform/ZhonTai.Admin/Core/Entities/EntityUpdate.cs

@@ -1,7 +1,9 @@
 using FreeSql.DataAnnotations;
+using Newtonsoft.Json;
 using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
 
 namespace ZhonTai.Admin.Core.Entities;
 
@@ -15,6 +17,8 @@ public class EntityUpdate<TKey> : EntityAdd, IEntityUpdate<TKey> where TKey : st
     /// </summary>
     [Description("修改者Id")]
     [Column(Position = -12, CanInsert = false)]
+    [JsonProperty(Order = 10000)]
+    [JsonPropertyOrder(10000)]
     public virtual long? ModifiedUserId { get; set; }
 
     /// <summary>
@@ -22,12 +26,16 @@ public class EntityUpdate<TKey> : EntityAdd, IEntityUpdate<TKey> where TKey : st
     /// </summary>
     [Description("修改者")]
     [Column(Position = -11, CanInsert = false), MaxLength(50)]
+    [JsonProperty(Order = 10001)]
+    [JsonPropertyOrder(10001)]
     public virtual string ModifiedUserName { get; set; }
 
     /// <summary>
     /// 修改时间
     /// </summary>
     [Description("修改时间")]
+    [JsonProperty(Order = 10002)]
+    [JsonPropertyOrder(10002)]
     [Column(Position = -10, CanInsert = false, ServerTime = DateTimeKind.Local)]
     public virtual DateTime? ModifiedTime { get; set; }
 }

src/platform/ZhonTai.Admin/Core/Helpers/UploadHelper.cs

@@ -31,7 +31,7 @@ public class UploadHelper
     { 
         if (file == null || file.Length < 1)
         {
-            throw ResultOutput.Exception("请上传文件！");
+            throw ResultOutput.Exception("请上传文件");
         }
 
         //格式限制

src/platform/ZhonTai.Admin/Domain/Api/ApiEntity.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using ZhonTai.Admin.Domain.PermissionApi;
 using ZhonTai.Admin.Domain.Permission;
 using ZhonTai.Admin.Core.Entities;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.Api;
 
@@ -62,6 +63,7 @@ public partial class ApiEntity : EntityBase
     [Navigate(nameof(ParentId))]
     public List<ApiEntity> Childs { get; set; }
 
+    [NotGen]
     [Navigate(ManyToMany = typeof(PermissionApiEntity))]
     public ICollection<PermissionEntity> Permissions { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/Dict/DictEntity.cs

@@ -1,6 +1,7 @@
 using ZhonTai.Admin.Core.Entities;
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.DictType;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.Dict;
 
@@ -20,6 +21,7 @@ public partial class DictEntity : EntityBase
     /// <summary>
     /// 字典类型
     /// </summary>
+    [NotGen]
     public DictTypeEntity DictType { get; set; }
 
     /// <summary>

src/platform/ZhonTai.Admin/Domain/Org/OrgEntity.cs

@@ -5,6 +5,7 @@ using ZhonTai.Admin.Domain.UserStaff;
 using ZhonTai.Admin.Domain.User;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.UserOrg;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.Org;
 
@@ -62,18 +63,21 @@ public partial class OrgEntity : EntityTenant
     /// <summary>
     /// 员工列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(UserOrgEntity))]
     public ICollection<UserStaffEntity> Staffs { get; set; }
 
     /// <summary>
     /// 用户列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(UserOrgEntity))]
     public ICollection<UserEntity> Users { get; set; }
 
     /// <summary>
     /// 角色列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(RoleOrgEntity))]
     public ICollection<RoleEntity> Roles { get; set; }
 

src/platform/ZhonTai.Admin/Domain/Permission/PermissionEntity.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using ZhonTai.Admin.Domain.Api;
 using ZhonTai.Admin.Domain.View;
 using ZhonTai.Admin.Domain.PermissionApi;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.Permission;
 
@@ -45,6 +46,7 @@ public partial class PermissionEntity : EntityBase
     /// <summary>
     /// 视图
     /// </summary>
+    [NotGen]
     public ViewEntity View { get; set; }
 
     /// <summary>
@@ -128,6 +130,7 @@ public partial class PermissionEntity : EntityBase
     /// </summary>
     public bool Enabled { get; set; } = true;
 
+    [NotGen]
     [Navigate(ManyToMany = typeof(PermissionApiEntity))]
     public ICollection<ApiEntity> Apis { get; set; }
 

src/platform/ZhonTai.Admin/Domain/PermissionApi/PermissionApiEntity.cs

@@ -2,6 +2,7 @@
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Permission;
 using ZhonTai.Admin.Domain.Api;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.PermissionApi;
 
@@ -16,10 +17,11 @@ public class PermissionApiEntity : EntityAdd
     /// 权限Id
     /// </summary>
 	public long PermissionId { get; set; }
-    
+
     /// <summary>
     /// 权限
     /// </summary>
+    [NotGen]
     public PermissionEntity Permission { get; set; }
 
     /// <summary>
@@ -30,5 +32,6 @@ public class PermissionApiEntity : EntityAdd
     /// <summary>
     /// 接口
     /// </summary>
+    [NotGen]
     public ApiEntity Api { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/Role/RoleEntity.cs

@@ -7,6 +7,7 @@ using ZhonTai.Admin.Domain.User;
 using ZhonTai.Admin.Domain.UserRole;
 using ZhonTai.Admin.Domain.RolePermission;
 using ZhonTai.Admin.Domain.Org;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.Role;
 
@@ -71,18 +72,21 @@ public partial class RoleEntity : EntityTenant
     /// <summary>
     /// 用户列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(UserRoleEntity))]
     public ICollection<UserEntity> Users { get; set; }
 
     /// <summary>
     /// 部门列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(RoleOrgEntity))]
     public ICollection<OrgEntity> Orgs { get; set; }
 
     /// <summary>
     /// 权限列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(RolePermissionEntity))]
     public ICollection<PermissionEntity> Permissions { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/RolePermission/RolePermissionEntity.cs

@@ -2,6 +2,7 @@
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Role;
 using ZhonTai.Admin.Domain.Permission;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.RolePermission;
 
@@ -25,10 +26,12 @@ public class RolePermissionEntity : EntityAdd
     /// <summary>
     /// 角色
     /// </summary>
+    [NotGen]
     public RoleEntity Role { get; set; }
 
     /// <summary>
     /// 权限
     /// </summary>
+    [NotGen]
     public PermissionEntity Permission { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/Tenant/TenantEntity.cs

@@ -6,6 +6,7 @@ using ZhonTai.Admin.Domain.Org;
 using System.Collections.Generic;
 using ZhonTai.Admin.Domain.TenantPkg;
 using ZhonTai.Admin.Domain.Pkg;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.Tenant;
 
@@ -23,6 +24,7 @@ public partial class TenantEntity : EntityBase
     /// <summary>
     /// 用户
     /// </summary>
+    [NotGen]
     public UserEntity User { get; set; }
 
     /// <summary>
@@ -33,6 +35,7 @@ public partial class TenantEntity : EntityBase
     /// <summary>
     /// 部门
     /// </summary>
+    [NotGen]
     public OrgEntity Org { get; set; }
 
     /// <summary>
@@ -72,6 +75,7 @@ public partial class TenantEntity : EntityBase
     /// <summary>
     /// 套餐列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(TenantPkgEntity))]
     public ICollection<PkgEntity> Pkgs { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/TenantPermission/TenantPermissionEntity.cs

@@ -2,6 +2,7 @@
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Tenant;
 using ZhonTai.Admin.Domain.Permission;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.TenantPermission;
 
@@ -20,15 +21,17 @@ public class TenantPermissionEntity : EntityAdd
     /// <summary>
     /// 权限Id
     /// </summary>
-		public long PermissionId { get; set; }
+	public long PermissionId { get; set; }
 
     /// <summary>
     /// 租户
     /// </summary>
+    [NotGen]
     public TenantEntity Tenant { get; set; }
 
     /// <summary>
     /// 权限
     /// </summary>
+    [NotGen]
     public PermissionEntity Permission { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/User/UserEntity.cs

@@ -8,6 +8,7 @@ using ZhonTai.Admin.Domain.UserRole;
 using ZhonTai.Admin.Domain.UserStaff;
 using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Domain.UserOrg;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.User;
 
@@ -18,6 +19,7 @@ namespace ZhonTai.Admin.Domain.User;
 [Index("idx_{tablename}_01", nameof(UserName) + "," + nameof(TenantId), true)]
 public partial class UserEntity : EntityTenant
 {
+    [NotGen]
     public TenantEntity Tenant { get; set; }
 
     /// <summary>
@@ -64,6 +66,7 @@ public partial class UserEntity : EntityTenant
     /// <summary>
     /// 部门
     /// </summary>
+    [NotGen]
     public OrgEntity Org { get; set; }
 
     /// <summary>
@@ -74,6 +77,7 @@ public partial class UserEntity : EntityTenant
     /// <summary>
     /// 直属主管
     /// </summary>
+    [NotGen]
     public UserEntity ManagerUser { get; set; }
 
     /// <summary>
@@ -108,18 +112,21 @@ public partial class UserEntity : EntityTenant
     /// <summary>
     /// 角色列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(UserRoleEntity))]
     public ICollection<RoleEntity> Roles { get; set; }
 
     /// <summary>
     /// 部门列表
     /// </summary>
+    [NotGen]
     [Navigate(ManyToMany = typeof(UserOrgEntity))]
     public ICollection<OrgEntity> Orgs { get; set; }
 
     /// <summary>
     /// 员工
     /// </summary>
+    [NotGen]
     [Navigate(nameof(Id))]
     public UserStaffEntity Staff { get; set; }
 }

src/platform/ZhonTai.Admin/Domain/UserOrg/UserOrgEntity.cs

@@ -2,6 +2,7 @@
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Domain.User;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.UserOrg;
 
@@ -20,6 +21,7 @@ public partial class UserOrgEntity : EntityUpdate
     /// <summary>
     /// 用户
     /// </summary>
+    [NotGen]
     public UserEntity User { get; set; }
 
     /// <summary>
@@ -30,6 +32,7 @@ public partial class UserOrgEntity : EntityUpdate
     /// <summary>
     /// 部门
     /// </summary>
+    [NotGen]
     public OrgEntity Org { get; set; }
 
     /// <summary>

src/platform/ZhonTai.Admin/Domain/UserRole/UserRoleEntity.cs

@@ -2,6 +2,7 @@
 using FreeSql.DataAnnotations;
 using ZhonTai.Admin.Domain.User;
 using ZhonTai.Admin.Domain.Role;
+using ZhonTai.Admin.Core.Attributes;
 
 namespace ZhonTai.Admin.Domain.UserRole;
 
@@ -17,6 +18,7 @@ public class UserRoleEntity : EntityAdd
     /// </summary>
     public long UserId { get; set; }
 
+    [NotGen]
     public UserEntity User { get; set; }
 
     /// <summary>
@@ -24,5 +26,6 @@ public class UserRoleEntity : EntityAdd
     /// </summary>
     public long RoleId { get; set; }
 
+    [NotGen]
     public RoleEntity Role { get; set; }
 }

src/platform/ZhonTai.Admin/Repositories/CustomGenerateData.cs

@@ -21,6 +21,9 @@ using ZhonTai.Admin.Domain.Org;
 using ZhonTai.Admin.Core.Db.Data;
 using FreeSql;
 using ZhonTai.Admin.Domain.UserOrg;
+using System.Reflection;
+using ZhonTai.Admin.Core.Attributes;
+using ZhonTai.Admin.Core.Helpers;
 
 namespace ZhonTai.Admin.Repositories;
 
@@ -78,15 +81,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
 
         #region 权限
 
-        var permissions = db.Queryable<PermissionEntity>().ToListIgnore(a => new
-        {
-            a.CreatedTime,
-            a.CreatedUserId,
-            a.CreatedUserName,
-            a.ModifiedTime,
-            a.ModifiedUserId,
-            a.ModifiedUserName
-        });
+        var permissions = await db.Queryable<PermissionEntity>().ToListAsync();
         var permissionTree = permissions.Clone().ToTree((r, c) =>
         {
             return c.ParentId == 0;
@@ -182,14 +177,10 @@ public class CustomGenerateData : GenerateData, IGenerateData
 
         var isTenant = appConfig.Tenant;
 
-        SaveDataToJsonFile<UserEntity>(users, isTenant);
-        SaveDataToJsonFile<RoleEntity>(roles, isTenant);
-        SaveDataToJsonFile<OrgEntity>(orgTree, isTenant);
-        SaveDataToJsonFile<UserStaffEntity>(staffs, isTenant);
         if (isTenant)
         {
             var tenantIds = tenants?.Select(a => a.Id)?.ToList();
-            SaveDataToJsonFile<UserEntity>(users.Where(a => tenantIds.Contains(a.TenantId.Value)), false);
+            SaveDataToJsonFile<UserEntity>(users.Where(a => tenantIds.Contains(a.TenantId.Value)));
             SaveDataToJsonFile<RoleEntity>(roles.Where(a => tenantIds.Contains(a.TenantId.Value)));
             orgTree = orgs.Clone().Where(a => tenantIds.Contains(a.TenantId.Value)).ToList().ToTree((r, c) =>
             {
@@ -207,6 +198,12 @@ public class CustomGenerateData : GenerateData, IGenerateData
             SaveDataToJsonFile<OrgEntity>(orgTree);
             SaveDataToJsonFile<UserStaffEntity>(staffs.Where(a => tenantIds.Contains(a.TenantId.Value)));
         }
+
+        SaveDataToJsonFile<UserEntity>(users, isTenant);
+        SaveDataToJsonFile<RoleEntity>(roles, isTenant);
+        SaveDataToJsonFile<OrgEntity>(orgTree, isTenant);
+        SaveDataToJsonFile<UserStaffEntity>(staffs, isTenant);
+        
         SaveDataToJsonFile<DictEntity>(dictionaries);
         SaveDataToJsonFile<DictTypeEntity>(dictionaryTypes);
         SaveDataToJsonFile<UserRoleEntity>(userRoles);
@@ -217,7 +214,7 @@ public class CustomGenerateData : GenerateData, IGenerateData
         SaveDataToJsonFile<PermissionApiEntity>(permissionApis);
         SaveDataToJsonFile<RolePermissionEntity>(rolePermissions);
         SaveDataToJsonFile<TenantEntity>(tenants);
-        SaveDataToJsonFile<TenantPermissionEntity>(tenantPermissions, propsContractResolver: new PropsContractResolver());
+        SaveDataToJsonFile<TenantPermissionEntity>(tenantPermissions);
         #endregion
     }
 }

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -39,6 +39,11 @@
             禁用操作日志
             </summary>
         </member>
+        <member name="T:ZhonTai.Admin.Core.Attributes.NotGenAttribute">
+            <summary>
+            不生成特性
+            </summary>
+        </member>
         <member name="T:ZhonTai.Admin.Core.Attributes.SingleInstanceAttribute">
             <summary>
             单例注入

src/platform/ZhonTai.Common/Helpers/EntityHelper.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace ZhonTai.Common.Helpers;
+
+/// <summary>
+/// 实体帮助类
+/// </summary>
+public class EntityHelper
+{
+    public static List<string> GetPropertyNamesByAttribute<T, A>() where T : class where A : Attribute
+    {
+        Type classType = typeof(T);
+
+        if (!classType.IsClass && !classType.IsAbstract)
+        {
+            throw new ArgumentException($"{classType.FullName} is not an class type.");
+        }
+
+        var propertyNames = classType.GetProperties()
+        .Where(p => p.GetCustomAttribute<A>() != null)
+        .Select(p => p.Name)
+        .ToList();
+
+        return propertyNames;
+    }
+
+    public static bool IsImplementInterface(Type type, Type interfaceType)
+    {
+        if (type == null || interfaceType == null || !interfaceType.IsInterface)
+        {
+            return false;
+        }
+
+        return interfaceType.IsAssignableFrom(type);
+    }
+}

src/platform/ZhonTai.Common/Helpers/InterfaceHelper.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace ZhonTai.Common.Helpers;
+
+/// <summary>
+/// 接口帮助类
+/// </summary>
+public class InterfaceHelper
+{
+    public static string[] GetPropertyNames<T>() where T : class
+    {
+        Type interfaceType = typeof(T);
+
+        if (!interfaceType.IsInterface)
+        {
+            throw new ArgumentException($"{interfaceType.FullName} is not an interface type.");
+        }
+
+        PropertyInfo[] properties = interfaceType.GetProperties();
+
+        string[] propertyNames = properties.Select(p => p.Name).ToArray();
+
+        return propertyNames;
+    }
+}

src/platform/ZhonTai.Common/ZhonTai.Common.xml

@@ -448,6 +448,11 @@
             <param name="hex"></param>
             <returns></returns>
         </member>
+        <member name="T:ZhonTai.Common.Helpers.EntityHelper">
+            <summary>
+            实体帮助类
+            </summary>
+        </member>
         <member name="M:ZhonTai.Common.Helpers.FileHelper.WriteFile(System.String,System.String)">
             <summary>
             写文件
@@ -478,6 +483,11 @@
             <param name="encode">编码格式</param>
             <returns></returns>
         </member>
+        <member name="T:ZhonTai.Common.Helpers.InterfaceHelper">
+            <summary>
+            接口帮助类
+            </summary>
+        </member>
         <member name="M:ZhonTai.Common.Helpers.IPHelper.IsIP(System.String)">
             <summary>
             是否为ip