Merge branch 'yb/8.2' into debug

logic/yb_community_question/yb_community_question_comment.go

@@ -421,6 +421,7 @@ func systemMessageToAdmin(adminInfo admin.Admin, wxUser user.UserInfo, community
 
 	// 获取评论对应的问答/视频信息
 	msgContent := ``
+	extra := ``
 	if communityQuestionComment.Source == 1 {
 		communityQuestion, e := yb_community_question.GetItemById(int(communityQuestionComment.CommunityQuestionID))
 		if e != nil {
@@ -435,6 +436,7 @@ func systemMessageToAdmin(adminInfo admin.Admin, wxUser user.UserInfo, community
 			return
 		}
 		msgContent = communityVideo.Title
+		extra = communityVideo.VarietyTagName
 	}
 	messageInfo := company_approval_message.MessageInfo{
 		CompanyName:          companyInfo.CompanyName,
@@ -445,6 +447,7 @@ func systemMessageToAdmin(adminInfo admin.Admin, wxUser user.UserInfo, community
 		UserId:               wxUser.UserID,
 		UserName:             communityQuestionComment.RealName,
 		CreateTime:           communityQuestionComment.CreateTime,
+		Extra:                extra,	// 附加字段
 	}
 	//客户添加消息
 	err = company_approval_message.AddCompanyApprovalMessage(utils.AdminId, receiveUserId, int(wxUser.CompanyID), int(communityQuestionComment.CommunityQuestionCommentID), msgType, sourceType, approvalStatus, companyName, remark, content, messageInfo)

services/company_approval_message/company_approval_message.go

@@ -41,6 +41,7 @@ type MessageInfo struct {
 	UserId               uint64    `json:"user_id"`
 	UserName             string    `json:"user_name"`
 	CreateTime           time.Time `json:"create_time"`
+	Extra                string    `json:"extra" description:"附加字段"`
 }
 
 // AddCompanyApprovalMessage 添加系统消息