Merge branch 'cygx_7.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity.go

@@ -811,9 +811,9 @@ func (this *ActivityCoAntroller) Detail() {
 	}
 	if hasPermission == 1 {
 		//是否展示限免标签
-		//if services.GetShowSustainable() && strings.Contains(activityInfo.ChartPermissionName, "研选") {
-		//	activityInfo.IsShowSustainable = true
-		//}
+		if services.GetShowSustainable() && strings.Contains(activityInfo.ChartPermissionName, "研选") {
+			activityInfo.IsShowSustainable = true
+		}
 		configCode := "description_of_research"
 		detail, err := models.GetConfigByCode(configCode)
 		if err != nil {