Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity_special_trip.go

@@ -456,12 +456,10 @@ func ActivitySpecialUserAddTrip(user *models.WxUserItem, activityId int) (err er
 		if activityInfo == nil {
 			return
 		}
-
-		first = fmt.Sprint("【", activityInfo.ResearchTheme, "】", "有客户报名")
 		keyword1 = fmt.Sprint(user.RealName, "--", user.CompanyName, "(所属销售：", sellerItemQy.RealName, ")")
 		keyword2 = user.Mobile
 		keyword3 = time.Now().Format(utils.FormatDateTime)
-		keyword4 = activityInfo.ResearchTheme
+		keyword4 = "报名专项调研【" + activityInfo.ResearchTheme + "】 "
 		remark = ""
 		openIdArr := make([]string, 0)
 		for _, v := range openIdList {

services/article.go

@@ -1953,7 +1953,7 @@ func AnnotationHtml(bodyText string) (annotation string) {
 	p := doc.Find("p")
 	p.Each(func(tk int, pd *goquery.Selection) {
 		pdText := pd.Text()
-		pdText = strings.Replace(pdText, " ", "", -1)
+		//pdText = strings.Replace(pdText, " ", "", -1)
 		if pdText != "" {
 			textLen := strings.Index(docText, pdText)
 			mapDoc[(strings.Index(docText, pdText))] = pdText