diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index f1c9353..80bb266 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -137,8 +137,8 @@
           <a-input placeholder="请输入邮箱" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'email', validatorRules.email]" :maxLength="50"/>
         </a-form-item>
 
-        <a-form-item label="邮箱授权码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入邮箱授权码" :disabled="disableSubmit" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'emailCode', validatorRules.emailCode]" :maxLength="50"/>
+        <a-form-item label="邮箱密码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input type="password" placeholder="请输入邮箱密码" @change="event => event.target.value = event.target.value.trim()" v-decorator="[ 'emailPassword', validatorRules.emailPassword]" :maxLength="50"/>
         </a-form-item>
 
         <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -212,10 +212,10 @@ export default {
           }],
           validateTrigger: 'blur'
         },
-        emailCode:{
+        emailPassword:{
           rules: [{
             required: true,
-            message: '请输入邮箱授权码'
+            message: '请输入邮箱密码'
           }],
           validateTrigger: 'blur'
         },
@@ -517,6 +517,8 @@ export default {
           formData.confirmpassword =  formData.password
           formData.phone = encrypt(that.rsaPublicKey,values.phone)
           formData.email = encrypt(that.rsaPublicKey,values.email)
+          // 加密邮箱密码
+          formData.emailPassword = encrypt(that.rsaPublicKey,values.emailPassword)
           //update-begin-author:taoyan date:2020710 for:多租户配置
           formData.relTenantIds = this.currentTenant.length > 0 ? this.currentTenant.join(',') : ''
           //update-end-author:taoyan date:2020710 for:多租户配置