Merge branch 'feature/jr_mini_0610' into debug

models/report.go

@@ -160,6 +160,7 @@ type ReportList struct {
 	IsCollect           int       `description:"是否收藏"`
 	ClassifyEnabled     bool      `description:"分类是否禁用"`
 	RaiReportId         int       `description:"RAI报告ID"`
+	MiniShow            int       `description:"是否在C端展示：0-否；1-是"`
 }
 
 type ReportListResp struct {

models/report_v2.go

@@ -393,7 +393,7 @@ func GetReportListCountByAuthorized(condition string, pars []interface{}) (count
 func GetReportListByAuthorized(condition string, pars []interface{}, startSize, pageSize int) (items []*ReportList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 
-	sql := `SELECT id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,modify_time,content_modify_time,report_create_time,state,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time FROM report as a WHERE 1=1  `
+	sql := `SELECT id,classify_id_first,classify_name_first,classify_id_second,classify_name_second,classify_id_third,classify_name_third,title,stage,create_time,modify_time,content_modify_time,report_create_time,state,author,report_layout,collaborate_type,is_public_publish,abstract,has_chapter,publish_time,mini_show FROM report as a WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}