浏览代码

Merge branch 'cygx_10.6' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

xingzai 1 年之前
父节点
当前提交
2c3d7e4ab9
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      models/micro_roadshow.go

+ 4 - 0
models/micro_roadshow.go

@@ -53,6 +53,7 @@ type MicroRoadShowPageList struct {
 	ChartPermissionId   int    `description:"行业ID"`
 	ChartPermissionName string `description:"行业名称"`
 	IndustryName        string `description:"产业名称"`
+	IndustryId          int    `description:"产业id"`
 	PlaySeconds         string `description:"音视频时长"`
 	ActivityId          int    `description:"活动ID"`
 	IsCollect           bool   `description:"是否收藏"`
@@ -75,6 +76,7 @@ func GetMicroRoadShowVideoPageListV8(startSize, pageSize int, condition string,
 			video_duration AS play_seconds,
 			img_url AS background_img,            
 			industry_name,
+			industry_id,
 			share_img_url AS share_img,
 			"" as  activity_id
 		FROM
@@ -102,6 +104,7 @@ func GetMicroRoadShowVideoPageListV8(startSize, pageSize int, condition string,
 			"" AS play_seconds,
 			"" AS background_img,
 			"" AS industry_name,
+			"",
 			"" AS share_img,
 			v.activity_id
 		FROM
@@ -128,6 +131,7 @@ func GetMicroRoadShowVideoPageListV8(startSize, pageSize int, condition string,
 			a.voice_play_seconds AS play_seconds,
 			a.img_url AS background_img,
 			"" AS industry_name,
+			"",
 			"" AS share_img,
 			a.activity_id 
 		FROM