Merge branch 'release' into 7.2

src/views/components/roleInfo/roleInfoPanel.vue

@@ -17,7 +17,7 @@
         <el-collapse v-model="collapseActive">
           <div
             v-for="(items, indexs) in roleList"
-            :key="indexs"
+            :key="items.role_id"
             class="contentItem"
           >
             <div class="title"></div>