Merge branch 'cygx_9.7' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -511,6 +511,7 @@ func (this *ActivityCoAntroller) Detail() {
 			}
 			activityInfo.IsShowFollowButton = true
 		}
+		activityInfo.IsShowFollowButton = true
 		if activityInfo.ReportLink != "" {
 			artList, err := services.GetActivityReportLinkToArticleList(activityInfo)
 			if err != nil && err.Error() != utils.ErrNoRow() {

controllers/article.go

@@ -82,6 +82,7 @@ func (this *ArticleController) Detail() {
 		br.ErrMsg = "获取信息失败,Err:" + err.Error()
 		return
 	}
+	detail.IsShowFollowButton = true
 	if isSendWx == 1 {
 		var condition string
 		var pars []interface{}

controllers/report.go

@@ -445,6 +445,7 @@ func (this *ReportController) ArticleCategoryList() {
 		resp.IsFollowButton = industryUserFollowMap[industrialManagementId]
 		resp.IsShowFollowButton = true
 	}
+	resp.IsShowFollowButton = true
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"