Merge branch 'cygx/7.4' into debug

controllers/activity.go

@@ -3034,7 +3034,6 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		}
 		// 新标签
 		if activityId > 0 {
-			// 产业新标签
 			activityIds := []int{activityId}
 			activityNewMap, _, e := services.GetActivityNewLabelMap(activityIds)
 			if e != nil {

models/industrial_management.go

@@ -606,7 +606,7 @@ func GetSourceIndustryByName(industryName string) (item *IndustrialManagement, e
 			INNER JOIN cygx_industrial_article_group_management AS mg ON mg.industrial_management_id = m.industrial_management_id
 			INNER JOIN cygx_article AS a ON a.article_id = mg.article_id AND a.article_type != 'lyjh'
 			WHERE
-				1 = 1 AND m.industry_name = ? AND a.publish_status = 1 AND a.category_name != "买方研选"
+				1 = 1 AND m.industry_name = ? AND a.publish_status = 1
 			GROUP BY
 				m.industrial_management_id`
 	err = orm.NewOrm().Raw(sql, industryName).QueryRow(&item)