Merge branch 'dev' of https://git.yidian-inc.com:8021/bp/op-web-service into dev

src/pages/Role/role-detail.vue

@@ -6,7 +6,7 @@
       <el-descriptions class="margin-top" :column="2" border>
         <el-descriptions-item>
           <template #label> ID </template>
-          {{ role_info_detail.role_id }}
+          {{ roleId }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 角色状态 </template>
@@ -102,9 +102,8 @@ export default {
       this.permissionsAll = res
     })
     reqGet_role_info(this.roleId).then((res) => {
-      const { role_id, role_name, role_status, update_time, update_user_name, create_time, create_user_name, role_account_list, permissions } = res
+      const { role_name, role_status, update_time, update_user_name, create_time, create_user_name, role_account_list, permissions } = res
       this.role_info_detail = {
-        role_id,
         role_name,
         role_status,
         update_time,