Merge branch 'ETA_1.0.6'

src/views/system_manage/etaBaseConfig.vue

@@ -38,7 +38,7 @@
             </div>
             <div class="part-base-tow part" >
                 <div class="side">
-                    <el-form-item label="国内短信模板" prop="LoginSmsTpId" >
+                    <!-- <el-form-item label="国内短信模板" prop="LoginSmsTpId" >
                         <div class="form-item-type-two sms-type">
                             <el-input type="text" v-model.trim="formData.LoginSmsTpId" placeholder="请输入国内短信模板ID" style="width: calc(50% - 10px);">
                                 <template slot="suffix">
@@ -65,7 +65,7 @@
                             </el-input>
                             <el-input type="text" v-model.trim="formData.SmsJhgjAppKey" placeholder="请输入国外短信模板appkey" style="width: calc(50% - 10px);" />
                         </div>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="邮件模板" prop="LoginEmailTemplateSubject" >
                         <div class="form-item-type-two">
                             <el-input type="text" v-model="formData.LoginEmailTemplateSubject" placeholder="请输入邮件标题" >