Merge branch 'eta/1.0.2' into debug

models/edb_data_calculate_zdyfx.go

@@ -82,6 +82,7 @@ func (obj CustomAnalysis) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo,
 		excelEdbMappingItem.CreateTime = time.Now()
 		excelEdbMappingItem.ModifyTime = time.Now()
 		excelEdbMappingItem.ExcelInfoId = customAnalysisData.ExcelInfoId
+		excelEdbMappingItem.Source = 4
 		excelEdbMappingItem.EdbInfoId = edbInfo.EdbInfoId
 		_, err = to.Insert(excelEdbMappingItem)
 		if err != nil {

models/excel_edb_mapping.go

@@ -9,6 +9,7 @@ import (
 type ExcelEdbMapping struct {
 	ExcelEdbMappingId int       `orm:"column(excel_edb_mapping_id);pk"`
 	ExcelInfoId       int       `description:"excel的id"`
+	Source            int       `description:"表格来源，1：excel插件的表格，2：自定义表格，3：混合表格，4：自定义分析，默认：1"`
 	EdbInfoId         int       `description:"计算指标id"`
 	CreateTime        time.Time `description:"创建时间"`
 	ModifyTime        time.Time `description:"修改时间"`