Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -1837,7 +1837,7 @@ public class AiHookServiceImpl implements AiHookService {
                             String courseTitleName = log.getCourseName() + log.getTitle();
                             courseTitleName = courseTitleName.replaceAll("[【】]", "");
                             userInfo.put("课程章节",courseTitleName);
-                            userInfo.put("课程状态",log.getLogType()==3?"待看课":log.getLogType()==1?"已完课":log.getLogType()==2?"已完课":"看课中断");
+                            userInfo.put("看课状态",log.getLogType()==3?"待看课":log.getLogType()==1?"已完课":log.getLogType()==2?"已完课":"看课中断");
                         }
                         Object value = map.get(name);
                         if(value != null){

fs-service/src/main/resources/mapper/fastGpt/FastGptChatSessionMapper.xml

@@ -115,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwUserId != null">qw_user_id,</if>
             <if test="lastTime != null">last_time,</if>
             <if test="isReply != null">is_reply,</if>
+            <if test="userInfo != null">user_info,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sessionId != null">#{sessionId},</if>
@@ -137,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwUserId != null">#{qwUserId},</if>
             <if test="lastTime != null">#{lastTime},</if>
             <if test="isReply != null">#{isReply},</if>
+            <if test="userInfo != null">#{userInfo},</if>
          </trim>
     </insert>
 
@@ -162,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwUserId != null">qw_user_id = #{qwUserId},</if>
             <if test="lastTime != null">last_time = #{lastTime},</if>
             <if test="isReply != null">is_reply = #{isReply},</if>
+            <if test="userInfo != null">user_info = #{userInfo},</if>
         </trim>
         where session_id = #{sessionId}
     </update>