Merge branch 'master' of https://github.com/metersphere/metersphere

frontend/src/business/components/api/definition/ApiDefinition.vue

@@ -27,6 +27,7 @@
           <!-- 列表集合 -->
           <ms-api-list
             v-if="item.type === 'list' && activeDom==='api' "
+            @runTest="runTest"
             :module-tree="nodeTree"
             :module-options="moduleOptions"
             :current-protocol="currentProtocol"

frontend/src/business/components/settings/system/EmailSetting.vue

@@ -40,7 +40,7 @@
         <el-col>
           <el-form-item :label="$t('system_parameter_setting.test_recipients')">
             <el-input v-model="formInline.recipient" :placeholder="$t('system_parameter_setting.test_recipients')"
-                      autocomplete="new-password" show-password type="text"  ref="input">
+                      autocomplete="new-password" type="text" ref="input">
             </el-input>
             <p style="color: #8a8b8d">({{ $t('system_parameter_setting.tip') }})</p>
           </el-form-item>