Merge branch 'cygx/7.4' into debug

controllers/activity.go

@@ -3006,6 +3006,7 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 			return
 		}
 		if sourceIndustry != nil {
+			resp.IndustrialManagementId = sourceIndustry.IndustrialManagementId
 			resp.IsJump = true
 			if sourceIndustry.ChartPermissionId == utils.CHART_PERMISSION_ID_YANXUAN {
 				resp.IsResearch = true

models/activity.go

@@ -261,12 +261,13 @@ type CygxActivityList struct {
 }
 
 type GetCygxActivityListRep struct {
-	Paging     *paging.PagingItem `description:"分页数据"`
-	List       []*ActivityDetail
-	Label      string `description:"主题"`
-	ImgUrl     string `description:"图片路径"`
-	IsResearch bool   `description:"是否属于研选"`
-	IsJump     bool   `description:"是否跳转"`
+	Paging                 *paging.PagingItem `description:"分页数据"`
+	List                   []*ActivityDetail
+	Label                  string `description:"主题"`
+	ImgUrl                 string `description:"图片路径"`
+	IsResearch             bool   `description:"是否属于研选"`
+	IsJump                 bool   `description:"是否跳转"`
+	IndustrialManagementId int    `description:"产业ID"`
 }
 
 //列表