Merge branch 'msg' into dev

netflix-dao/src/main/java/com/cyksj/model/entity/QyMsgContent.java

@@ -3,6 +3,7 @@ package com.cyksj.model.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.ejlchina.searcher.bean.DbField;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -29,17 +30,20 @@ public class QyMsgContent {
 	/**
 	 * 成员id
 	 */
+	@DbField("follow_id")
 	private String followId;
 
 	/**
 	 * 客户id
 	 */
+	@DbField("external_userid")
 	private String externalUserid;
 
 	/**
 	 * 消息发送方id。同一企业内容为userid，非相同企业为external_userid。消息如果是机器人发出，也为external_userid
 	 */
 	@TableField("`from`")
+	@DbField("`from`")
 	private String from;
 
 	private String fromView;
@@ -103,6 +107,7 @@ public class QyMsgContent {
 	 * 撤回
 	 */
 	@TableField("`revoke`")
+	@DbField("`revoke`")
 	private String revoke;
 	/**
 	 * 表情包