Merge branch 'cygx_8.5' into debug

controllers/activity.go

@@ -1044,6 +1044,16 @@ func (this *ActivityCoAntroller) Detail() {
 			activityInfo.AudioLink = true
 			activityInfo.VideoDetail = mapActivityVideo[activityId]
 		}
+		//8.5 小程序活动详情页 除专家电话外 其余属于新产业的活动 ，不显示 new 标签
+		if activityInfo.ActivityTypeName != "专家电话会" {
+			for _, rep := range activityInfo.Listndustrial {
+				rep.IndustryNewLabel = false
+			}
+		}
+		//8.5 买方研选的活动去掉限免标签
+		if strings.Contains(activityInfo.ChartPermissionName, "研选"){
+			activityInfo.IsShowSustainable = false
+		}
 		//处理按钮是否展示问题
 		resp.Detail = services.ActivityButtonShow(activityInfo)
 	}

models/article.go

@@ -669,7 +669,7 @@ FROM
 WHERE
 	c.type_name = '综述报告' 
 	AND m.category_id = c.category_id_two 
-	AND m.chart_permission_id = ? `
+	AND m.chart_permission_id = ? ORDER BY last_updated_time `
 
 	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return