Merge branch 'fix/1.8.3' into debug

# Conflicts:
#	controllers/data_manage/chart_info.go
#	models/data_manage/chart_info.go

controllers/data_manage/chart_info.go

@@ -4487,6 +4487,7 @@ func (this *ChartInfoController) PreviewSeasonChartInfo() {
 	br.Data = resp
 }
 
+
 // ChartInfoImgSetBySvg
 // @Title 图表图片上传
 // @Param   Img   query   string  true       "图片"

models/classify.go

@@ -43,6 +43,7 @@ type Classify struct {
 	Enabled           int       `description:"是否可用，1可用，0禁用"`
 	Level             int       `description:"层级"`
 	HasChild          int       `description:"是否有子级别，0：下面没有子分类，1：下面有子分类；默认：0"`
+	ReportShowType    int       `description:"报告详情的展示类型：1-拼接；2:目录"`
 }
 
 type ClassifyAddReq struct {

services/classify.go

@@ -265,7 +265,8 @@ func AddReportClassify(classifyName string, parentId int, chartPermissionIdList
 	classify.ModifyTime = nowTime
 	classify.Sort = maxSort + 1
 	classify.Enabled = 1
-	classify.ShowType = 1 //默认列表格式
+	classify.ShowType = 1       //默认列表格式
+	classify.ReportShowType = 1 //默认列表格式
 	classify.IsShow = 1
 	classify.Level = level
 	/*classify.Abstract = req.Abstract