Merge branch 'master' into demo1

2045b956 · zhangyichen · 93bf00b1 · 6f2200a2 · 2045b956
Commit 2045b956 authored Jul 08, 2022 by zhangyichen
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

index.vue src/views/system/role/index.vue +5 -5

No files found.
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -80,11 +80,11 @@
            {{ scope.row.roleKey || '-' }}
          </template>
        </el-table-column>
-        <el-table-column label="显示顺序" prop="roleSort">
-          <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="显示顺序" prop="roleSort">-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ scope.row.roleSort || '-' }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
        <el-table-column label="状态" width="100">
          <template slot-scope="scope" style="text-align: left">
            <el-switch