Merge remote-tracking branch 'origin/master'

src/views/qw/externalContact/index.vue

@@ -833,7 +833,7 @@
         </el-form>
         <el-table v-loading="log.loading" :data="log.list">
           <el-table-column label="所属企微主体" align="center" prop="corpName"/>
-          <el-table-column label="所属企微" align="center" prop="qwUserNickName"/>
+          <el-table-column label="所属企微" align="center" prop="qwUserName"/>
           <!--          <el-table-column label="企微" align="center" prop="qwUserName"/>-->
           <el-table-column label="项目" align="center" prop="projectName"/>
           <el-table-column label="课程" align="center" prop="courseName"/>

src/views/qw/externalContact/myExternalContact.vue

@@ -898,7 +898,8 @@
           </el-form-item>
         </el-form>
         <el-table v-loading="log.loading" :data="log.list">
-          <!--          <el-table-column label="企微" align="center" prop="qwUserName"/>-->
+          <el-table-column label="所属企微主体" align="center" prop="corpName"/>
+          <el-table-column label="所属企微" align="center" prop="qwUserName"/>
           <el-table-column label="项目" align="center" prop="projectName"/>
           <el-table-column label="课程" align="center" prop="courseName"/>
           <el-table-column label="小节" align="aligner" prop="videoName"/>