Merge branch 'feature/eta1.1.0_edb_classify' into debug

# Conflicts:
#	controllers/data_manage/predict_edb_info.go
#	models/data_manage/response/predit_edb_info.go

controllers/data_manage/predict_edb_info.go

@@ -970,15 +970,12 @@ func (this *PredictEdbInfoController) Detail() {
 			calculateList[k] = v
 		}
 	}
-	fullEdb := new(data_manage.EdbInfoFullClassify)
 	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)
 	if err != nil {
 		br.Msg = err.Error()
 		br.ErrMsg = errMsg
 		return
 	}
-	fullEdb.EdbInfo = edbInfo
-	fullEdb.ClassifyList = classifyList
 
 	// 拟合残差计算相关系数
 	var correlationStr string
@@ -1024,12 +1021,13 @@ func (this *PredictEdbInfoController) Detail() {
 	}
 
 	resp := response.PredictEdbInfo{
-		EdbInfo:        *fullEdb,
+		EdbInfo:        *edbInfo,
 		RuleType:       ruleType,
 		FixedValue:     fixedValue,
 		CalculateList:  calculateList,
 		RuleList:       predictEdbConfList,
 		CorrelationStr: correlationStr,
+		ClassifyList:   classifyList,
 	}
 	br.Ret = 200
 	br.Success = true

models/data_manage/response/predit_edb_info.go

@@ -26,12 +26,13 @@ type PredictEdbInfoDataResp struct {
 
 // PredictEdbInfo 预测指标详情
 type PredictEdbInfo struct {
-	data_manage.EdbInfoFullClassify
+	data_manage.EdbInfo
 	RuleType       int                                   `description:"预测规则，1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值"`
 	FixedValue     float64                               `description:"固定值"`
 	CalculateList  []*data_manage.EdbInfoCalculateDetail `description:"关联指标"`
 	RuleList       []data_manage.PredictEdbConfDetail    `description:"指标规则配置"`
 	CorrelationStr string                                `description:"相关性系数字符串"`
+	ClassifyList   []*data_manage.EdbClassifyIdItems     `description:"父级分类列表"`
 }
 
 // PredictEdbInfoChartDataResp 获取预测指标绘图数据返回