Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_12.4

controllers/activity.go

@@ -2128,9 +2128,8 @@ func (this *ActivityController) ActivityListSearch() {
 					au.PopupMsg = services.UserPermissionPopupMsgApplyMicroVideo
 				}
 			}
-			//}
-			item.AuthInfo = au
 		}
+		item.AuthInfo = au
 		list = append(list, item)
 	}
 	if len(list) == 0 {

controllers/micro_roadshow.go

@@ -145,6 +145,8 @@ func (this *MicroRoadShowController) List() {
 				item.IsCollect = true
 			}
 		}
+
+		item.IndustrialManagementId = item.IndustryId
 	}
 
 	// 用户权限

models/micro_roadshow.go

@@ -50,6 +50,7 @@ type MicroRoadShowPageList struct {
 	ActivityId             int       `description:"活动ID"`
 	IsCollect              bool      `description:"是否收藏"`
 	IndustrialManagementId int       `description:"产业ID"`
+	IndustryId             int       `description:"产业ID"`
 	CreateTime             string    `description:"视频创建时间"`
 	CollectTime            time.Time `description:"收藏时间"`
 	AuthInfo               *UserPermissionAuthInfo