Merge branch 'yx_1.1' into debug

services/wechat_send_category_template_msg.go

@@ -172,7 +172,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 		keyword2 = "主题变更"
 	}
 
-	keyword1 = activityInfo.ActivityName
+	keyword1 = utils.TruncateActivityNameString(activityInfo.ActivityName)
 	openIdArr := make([]string, len(openIdList))
 	for i, v := range openIdList {
 		openIdArr[i] = v.OpenId