Merge branch 'need/cygx_990' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/activity_video.go

@@ -52,7 +52,7 @@ type CygxActivityVideoListRep struct {
 // 列表
 func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  AND  AND  v.is_hide = 0  `
+	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  AND  v.is_hide = 0  `
 	if condition != "" {
 		sql += condition
 	}