合并-冲突

src/views/business/outPersonal/index.vue

@@ -204,9 +204,9 @@
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <!-- <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
-          </div>
+          <!--          <div class="el-upload__tip" slot="tip">-->
+          <!--            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 -->
+          <!--          </div>-->
           <span>仅允许导入xls、xlsx格式文件。</span>
           <a style="color:#1890ff;margin:0px;line-height:14px" class="download" download="发薪名单模板"
             href="/userImportTemplate.xlsx" target="_blank">下载模板</a>