Merge branch 'cygx4.2_web' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/activity_video.go

@@ -113,7 +113,7 @@ func GetCygxActivityVideoById(videoId int) (item *CygxActivityVideoDetailResp, e
 			a.chart_permission_name
 		FROM
 			cygx_activity_video AS v
-			INNER JOIN cygx_activity AS a 
+			INNER JOIN cygx_activity AS a  ON  v.activity_id = a.activity_id
 		WHERE
 			video_id = ? 
 			LIMIT 1 `