Merge remote-tracking branch 'origin/master'

luoyb

2021-03-06 9bda7c9508b724a6ae0c1c2ffcfa7467925b8d5b

 src/views/febs/system/user/Index.vue

@@ -93,7 +93,11 @@
          <span>{{ scope.row.certificateNumb }}</span>
        </template>
      </el-table-column>
      <el-table-column label="手机" :show-overflow-tooltip="true" align="center" min-width="120px" />
      <el-table-column label="手机" :show-overflow-tooltip="true" align="center" min-width="120px">
        <template slot-scope="scope">
          <span>{{ scope.row.mobile }}</span>
        </template>
      </el-table-column>
      <el-table-column :label="$t('table.user.email')" :show-overflow-tooltip="true" align="center" min-width="150px">
        <template slot-scope="scope">
          <span>{{ scope.row.email }}</span>
@@ -189,7 +193,7 @@
      sort: {},
      selection: [],
      pagination: {
        size: 10,
        size: 15,
        num: 1
      }
    }