diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a687fc8d5a..44634f221f 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -278,7 +278,7 @@ export default {
       default_module: 'Default Module'
     },
     datasource: 'Datasource',
-    char_can_not_more_50: 'Name can not more 50 char',
+    char_can_not_more_50: 'Can not more 50 char',
     share_success: 'Share Success'
   },
   documentation: {
@@ -435,7 +435,8 @@ export default {
     current_user: 'Current User',
     origin_passwd: 'Origin Password',
     new_passwd: 'New Password',
-    confirm_passwd: 'Confirm Password'
+    confirm_passwd: 'Confirm Password',
+    change_password: 'Change Password'
   },
   role: {
     menu_authorization: 'Menu Authorization',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index a8b24afed5..8330f734c8 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -278,7 +278,7 @@ export default {
       default_module: '默认模块'
     },
     datasource: '數據源',
-    char_can_not_more_50: '名稱不能超過50字符',
+    char_can_not_more_50: '不能超過50字符',
     share_success: '分享成功'
   },
   documentation: {
@@ -435,7 +435,8 @@ export default {
     current_user: '當前用戶',
     origin_passwd: '原始密碼',
     new_passwd: '新密碼',
-    confirm_passwd: '確認密碼'
+    confirm_passwd: '確認密碼',
+    change_password: '修改密碼'
   },
   role: {
     menu_authorization: '菜單授權',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index e0246ec79d..2feb5ef0f3 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -278,7 +278,7 @@ export default {
       default_module: '默认模块'
     },
     datasource: '数据源',
-    char_can_not_more_50: '名称不能超过50字符',
+    char_can_not_more_50: '不能超过50字符',
     share_success: '分享成功'
   },
   documentation: {
@@ -435,7 +435,8 @@ export default {
     current_user: '当前用户',
     origin_passwd: '原始密码',
     new_passwd: '新密码',
-    confirm_passwd: '确认密码'
+    confirm_passwd: '确认密码',
+    change_password: '修改密码'
   },
   role: {
     menu_authorization: '菜单授权',
diff --git a/frontend/src/layout/components/Topbar.vue b/frontend/src/layout/components/Topbar.vue
index 0f73ef356d..4f5bccaedb 100644
--- a/frontend/src/layout/components/Topbar.vue
+++ b/frontend/src/layout/components/Topbar.vue
@@ -47,7 +47,7 @@
             <el-dropdown-item>{{ $t('commons.personal_info') }}</el-dropdown-item>
           </router-link>
           <router-link to="/person-pwd/index">
-            <el-dropdown-item>{{ $t('user.reset_password') }}</el-dropdown-item>
+            <el-dropdown-item>{{ $t('user.change_password') }}</el-dropdown-item>
           </router-link>
           <a href="/swagger-ui.html" target="_blank">
             <el-dropdown-item>{{ $t('commons.help_documentation') }} </el-dropdown-item>
diff --git a/frontend/src/views/system/role/form.vue b/frontend/src/views/system/role/form.vue
index fd7619736d..7a9930f673 100644
--- a/frontend/src/views/system/role/form.vue
+++ b/frontend/src/views/system/role/form.vue
@@ -30,7 +30,7 @@ export default {
         name: [
           { required: true, trigger: 'blur', validator: this.roleValidator }
         ],
-        code: [{ required: true, message: '请输入代码', trigger: 'blur' }]
+        description: [{ max: 50, message: this.$t('commons.char_can_not_more_50'), trigger: 'blur' }]
       },
       roles: [],
       originName: null
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index e04aae98c6..2045fee5a2 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -18,6 +18,7 @@
           </template>
 
           <el-table-column prop="name" :label="$t('commons.name')" />
+          <el-table-column :show-overflow-tooltip="true" prop="description" :label="$t('commons.description')" />
           <el-table-column :show-overflow-tooltip="true" prop="createTime" :label="$t('commons.create_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.createTime | timestampFormatDate }}</span>
@@ -118,9 +119,9 @@ export default {
       columns: [],
       buttons: [
         {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit
+          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit, disabled: this.btnDisabled
         }, {
-          label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete
+          label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete, disabled: this.btnDisabled
         }
       ],
       searchConfig: {
@@ -156,7 +157,7 @@ export default {
       const param = temp || {}
       roleGrid(this.paginationConfig.currentPage, this.paginationConfig.pageSize, param).then(response => {
         const data = response.data
-        this.total = data.itemCount
+        this.paginationConfig.total = data.itemCount
         this.tableData = data.listObject
       })
     },
@@ -263,6 +264,9 @@ export default {
       }).catch(() => {
 
       })
+    },
+    btnDisabled(row) {
+      return !row.createTime
     }
   }
 }
diff --git a/frontend/src/views/system/user/personPwd.vue b/frontend/src/views/system/user/personPwd.vue
index 4ed79f760e..8766f2e49a 100644
--- a/frontend/src/views/system/user/personPwd.vue
+++ b/frontend/src/views/system/user/personPwd.vue
@@ -1,5 +1,5 @@
 <template>
-  <layout-content :header="$t('member.edit_password')">
+  <layout-content :header="$t('user.change_password')">
 
     <el-form ref="createUserForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
       <el-form-item :label="$t('user.origin_passwd')" prop="oldPwd">