Merge remote-tracking branch 'origin/dev-1.1.0' into dev-1.1.0

leromro-core/src/main/java/com/leromro/core/facade/ConversationRecordFacade.java

@@ -127,6 +127,7 @@ public class ConversationRecordFacade {
                 .build();
         LambdaUpdateWrapper<ConversationRecord> wrapper = new LambdaUpdateWrapper<ConversationRecord>()
                 .eq(ConversationRecord::getConversationRecordId, dto.getConversationRecordId())
+                .set(ConversationRecord::getMsgType, dto.getMsgType())
                 .set(ConversationRecord::getNewestMsgTime, conversationMsgRecord.getMsgSendTime())
                 .set(ConversationRecord::getNewestMsgContent, conversationMsgRecord.getMsgContent());
         //接收人

leromro-core/src/main/java/com/leromro/core/service/impl/ConversationRecordServiceImpl.java

@@ -106,6 +106,7 @@ public class ConversationRecordServiceImpl extends ServiceImpl<ConversationRecor
                 .build();
         //会话的修改条件
         LambdaUpdateWrapper<ConversationRecord> updateWrapper =  new LambdaUpdateWrapper<ConversationRecord>()
+                .set(ConversationRecord::getMsgType, "1")
                 .set(ConversationRecord::getNewestMsgTime, conversationMsgRecord.getMsgSendTime())
                 .set(ConversationRecord::getNewestMsgContent, conversationMsgRecord.getMsgContent());
         //接收人
@@ -133,6 +134,7 @@ public class ConversationRecordServiceImpl extends ServiceImpl<ConversationRecor
             //不存在则创建会话,并保存
             conversationRecord = ConversationRecord.builder()
                     .conversationType("1")
+                    .msgType("1")
                     .newestMsgTime(conversationMsgRecord.getMsgSendTime())
                     .newestMsgContent(conversationMsgRecord.getMsgContent())
                     .build();