Merge branch 'ETA_1.9.4' into debug

# Conflicts:
#	models/data_manage/chart_info.go

models/data_manage/chart_info.go

@@ -2564,3 +2564,9 @@ func GetChartInfoBySourceAndParentId(source, parentId, adminId int) (items []*Ch
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// PreviewSeasonChartReq 预览季节性图的请求入参
+type PreviewSeasonChartReq struct {
+	ChartEdbInfoList  []*ChartSaveItem `description:"指标及配置信息"`
+	SeasonExtraConfig string           `description:"季节图额外配置信息,json字符串"`
+}