Merge branch 'master' into feature/migrate_wecht_msg

# Conflicts:
#	services/wechat_send_msg.go

services/wechat_send_msg.go

@@ -487,7 +487,6 @@ func SendYbQuestionDistributeWxMsg(questionId, adminId int, openid, questionTitl
 	sendInfo.SendType = utils.TEMPLATE_MSG_YB_COMMUNITY_QUESTION
 	sendInfo.OpenIdArr = openIdArr
 	err = SendTemplateMsg(sendInfo)
-
 	utils.FileLog.Info("send end")
 	return
 }