Merge remote-tracking branch 'origin/main'

Author: WangJunZzz

vben28/src/views/admin/dictionary/AbpDictionary.vue

@@ -143,7 +143,7 @@
         bordered: true,
         canResize: true,
         rowSelection: { type: 'radio' },
-        pagination: false,
+        maxHeight: 600,
         actionColumn: {
           width: 50,
           title: t('common.action'),