Merge branch 'feature/eta1.4.3_yongyi_edb' into debug

# Conflicts:
#	models/data_manage/edb_data_base.go

models/data_manage/edb_data_base.go

@@ -174,14 +174,6 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 	return
 }
 
-func GetBaseIndexTableName(source int) (tableName string) {
-	edbSource := EdbSourceIdMap[source]
-	if edbSource != nil {
-		tableName = edbSource.IndexTableName
-	}
-	return
-}
-
 //计算指标->关联的基础指标表
 //func GetEdbInfoCalculateTableName(source int) (tableName string) {
 //	switch source {
@@ -300,3 +292,11 @@ func GetBaseIndexInfoByEdbCode(edbCode string, source int) (item *BaseIndexInfo,
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }
+
+func GetBaseIndexTableName(source int) (tableName string) {
+	edbSource := EdbSourceIdMap[source]
+	if edbSource != nil {
+		tableName = edbSource.IndexTableName
+	}
+	return
+}