Merge branch 'yx_1.1' into debug

services/wechat_send_category_template_msg.go

@@ -178,7 +178,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 		openIdArr[i] = v.OpenId
 	}
 
-	keyword3 = newStr
+	keyword3 = "东莞"
 
 	redirectUrl = utils.WX_MSG_PATH_ACTIVITY_DETAIL + strconv.Itoa(activityId) + "&IsSendWx=1"
 	sendInfo := new(SendWxCategoryTemplate)