Merge branch 'dev-meta-dz' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/netease/NeteaseMessage.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
-import java.sql.Timestamp;
 
 @Entity
 @Data
@@ -17,6 +16,7 @@ import java.sql.Timestamp;
 @Builder
 public class NeteaseMessage extends BaseEntity {
     private Long    msgId;
+    @Searchable
     private String  fromId;
     private String  fromAvatar;
     private String  fromNickName;

src/main/vue/src/views/NeteaseMessageList.vue

@@ -35,8 +35,7 @@
         >
             <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
             <el-table-column prop="id" label="ID" width="100"> </el-table-column>
-            <el-table-column prop="from" label="发送用户"> </el-table-column>
-            <el-table-column prop="to" label="收信用户"> </el-table-column>
+            <el-table-column prop="fromId" label="发送用户"> </el-table-column>
             <el-table-column prop="ope" label="发信类型"> </el-table-column>
             <el-table-column prop="type" label="信息类型"> </el-table-column>
             <el-table-column prop="body" label="信息主题"> </el-table-column>