Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/course/vo/FsCourseWatchLogListVO.java

@@ -55,6 +55,7 @@ public class FsCourseWatchLogListVO extends BaseEntity
     @Excel(name = "企业微信员工名称")
     private String qwUserName;
 
+
     @Excel(name = "所属销售")
     private String companyUserName;
 
@@ -93,4 +94,6 @@ public class FsCourseWatchLogListVO extends BaseEntity
     @Excel(name = "外部联系人名称")
     private String externalUserName; //外部联系人名称
 
+    private String externalUserAvatar;//外部联系人头像
+
 }

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where log_id = #{logId}
     </select>
     <select id="selectFsCourseWatchLogListVO" resultType="com.fs.course.vo.FsCourseWatchLogListVO">
-        select l.log_id,l.user_id,uc.course_name,v.title as video_name,u.nick_name as fsNickName, u.avatar as fsAvatar,
+        select l.log_id,l.user_id,uc.course_name,v.title as video_name,qec.avatar as external_user_avatar,
         l.log_type,SEC_TO_TIME(l.duration) as duration,c.company_name,l.camp_period_time,l.finish_time,
         cu.nick_name as company_user_name ,l.send_type,l.create_time,l.update_time,l.last_heartbeat_time,
         qu.qw_user_name,qec.name as external_user_name,c.company_id