Merge branch 'dev' of xiongzhu/raex_front into master

src/plugins/chat.js

@@ -188,7 +188,7 @@ function getPushMsg(msgs, oldMsgs = []) {
         .map(item => {
             return {
                 ...item,
-                time: item.time || new Date(item.createdAt)
+                time: item.time || item.timetag || new Date(item.createdAt)
             };
         })
         .sort((a, b) => {