Merge branch 'master' into pre

store/index.ts

@@ -487,13 +487,13 @@ export default {
                                             items
                                             items
                                         );
                                         );
                                     }
                                     }
-                                    dispatch(
-                                        ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT
-                                    ).finally(resolve);
                                     commit(
                                     commit(
                                         ChatStore.MUTATION_SAVE_CHAT_LIST,
                                         ChatStore.MUTATION_SAVE_CHAT_LIST,
                                         cache
                                         cache
                                     );
                                     );
+                                    dispatch(
+                                        ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT
+                                    ).finally(resolve);
                                 })
                                 })
                                 .catch(reject);
                                 .catch(reject);
                         });
                         });

xim/models/chat.ts

@@ -55,6 +55,7 @@ export interface Chat {
     biz_type_code: string;
     biz_type_code: string;
     business_data?: string;
     business_data?: string;
     detail_name?: string;
     detail_name?: string;
+    keyword?: string;
 }
 }
 
 
 export interface Message {
 export interface Message {