From 06963d397d023ba076508808c8a0ec55da85067e Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期三, 10 三月 2021 13:39:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/febs/system/user/Edit.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/febs/system/user/Edit.vue b/src/views/febs/system/user/Edit.vue
index 96c4683..7acee37 100644
--- a/src/views/febs/system/user/Edit.vue
+++ b/src/views/febs/system/user/Edit.vue
@@ -11,7 +11,7 @@
       <el-form-item :label="$t('table.user.username')" prop="username">
         <el-input v-model="user.username" :readonly="user.userId === '' ? false : 'readonly'" />
       </el-form-item>
-      <el-form-item label="员工姓名" prop="nickName">
+      <el-form-item label="姓名" prop="nickName">
         <el-select v-model="user.nickName" filterable placeholder="" style="width:100%" @change="nickName">
           <el-option
             v-for="item in baseinfo"

--
Gitblit v1.8.0