Merge branch 'yx_1.1' into debug

services/wx_category_template_msg.go

@@ -922,7 +922,7 @@ func SendActivityBeginMsg(cont context.Context) (err error) {
 
 		sendInfo := new(SendWxCategoryTemplate)
 		sendInfo.Keywords = keywords
-		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdArticleUserRemind
 		sendInfo.RedirectTarget = 4
 		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
 		sendInfo.OpenIdArr = openIdArr
@@ -1022,7 +1022,7 @@ func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 
 		sendInfo := new(SendWxCategoryTemplate)
 		sendInfo.Keywords = keywords
-		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdActivityPublishApply
+		sendInfo.TemplateId = utils.WxMsgCategoryTemplateIdArticleUserRemind
 		sendInfo.RedirectTarget = 4
 		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE_ADD
 		sendInfo.OpenIdArr = openIdArr