Merge branch 'ETA_1.4.2' into debug

controllers/smart_report/smart_resource.go

@@ -102,12 +102,7 @@ func (this *SmartReportResourceController) List() {
 	startSize = utils.StartIndex(params.CurrentIndex, params.PageSize)
 
 	fields := []string{
-		"resource_id",  "create_time", "img_name", "img_url",
-	}
-	if params.Type > 0 {
-		fields = []string{
-			"resource_id",  "create_time", "img_name", "img_url", "type",
-		}
+		"resource_id",  "create_time", "img_name", "img_url", "type",
 	}
 	list, e := reportOB.GetPageItemsByCondition(condition, pars, fields, startSize, params.PageSize)
 	if e != nil {

models/smart_report/smart_report.go

@@ -53,6 +53,9 @@ type SmartReport struct {
 	DetailPdfUrl        string    `description:"报告详情PDF地址"`
 	CreateTime          time.Time `description:"创建时间"`
 	ModifyTime          time.Time `description:"修改时间"`
+	HeadImg             string    `description:"报告头图地址"`
+	EndImg              string    `description:"报告尾图地址"`
+	CanvasColor         string    `description:"画布颜色"`
 }
 
 func (m *SmartReport) TableName() string {