Merge remote-tracking branch 'origin/main'

2023-09-27 11:53:24 +08:00
parent 63fec7fd0b a63b7e6943
commit 1fc1f63f39
1 changed files with 2 additions and 2 deletions
@@ -135,7 +135,7 @@ export default {
      columns: [
        {
          title: this.$t('user.account'),
-          dataIndex: 'account',
+          dataIndex: 'username',
          align: 'center',
          scopedSlots: { customRender: 'text' }
        },
@@ -153,7 +153,7 @@ export default {
        },
        {
          title: this.$t('role'),
-          dataIndex: 'role',
+          dataIndex: 'roleTxt',
          align: 'center',
          scopedSlots: { customRender: 'text' }
        },