Merge remote-tracking branch 'origin/master'

孔祥富

2021-03-10 06963d397d023ba076508808c8a0ec55da85067e

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

@@ -83,7 +83,7 @@
          <span>{{ scope.row.username }}</span>
        </template>
      </el-table-column>
      <el-table-column label="员工姓名" prop="nickName" :show-overflow-tooltip="true" align="center" min-width="120px">
      <el-table-column label="姓名" prop="nickName" :show-overflow-tooltip="true" align="center" min-width="120px">
        <template slot-scope="scope">
          <span>{{ scope.row.nickName }}</span>
        </template>