Merge branch 'main' into dev/chat

# Conflicts:
#	src/lib/msgUtils.js

src/lib/msgUtils.js

@@ -378,8 +378,8 @@ export const whatsappMsgTypeMapped = {
       id: msg.wamid,
       meetingID: msg.wamid,
       title: msg.contacts.length === 1 ? `联系人` : `${msg.contacts.length} 位联系人`,
-      text: msg.contacts.map((ele) => `${ele?.org?.company || ele.name.formatted_name}: ${ele.phones[0].wa_id || ele.phones[0].phone}`).join('\n'),
-      data: msg.contacts.map((ele) => ({ id: ele.phones[0]?.wa_id || ele.phones[0].phone, wa_id: ele.phones[0]?.wa_id || ele.phones[0].phone, name: ele?.org?.company || ele.name.formatted_name })),
+      text: msg.contacts.map((ele) => `${(ele?.org?.company || '') +' '+ele.name.formatted_name}: ${ele.phones[0].wa_id || ele.phones[0].phone}`).join('\n'),
+      data: msg.contacts.map((ele) => ({ id: ele.phones[0]?.wa_id || ele.phones[0].phone, wa_id: ele.phones[0]?.wa_id || ele.phones[0].phone, name: (ele?.org?.company || '') +' '+ele.name.formatted_name })),
     }),
     renderForReply: (msg) => ({
       id: msg.wamid,